Mercurial Mercurial > oss > FCL > sf > adapt > qemu / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to syborg-graphicswrapper.vcproj graphics-phase-3
authorGareth Stockwell <gareth.stockwell@accenture.com>
Wed, 22 Sep 2010 15:40:40 +0100
branchgraphics-phase-3
changeset 111 345f1c88c950
parent 110 52ce3e8fba90
child 112 b6c206049d8a
Fixes to syborg-graphicswrapper.vcproj These changes allow syborg-graphicswrapper to link against the hostthreadadapter and khronosapiwrapper libraries built by the graphics.simulator component. The .vcproj file uses relative paths, which requires that the following three packages are laid out as follows: os/ graphics adapt/ graphics.simulator qemu
symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp file | annotate | diff | comparison | revisions
symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj file | annotate | diff | comparison | revisions 
--- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp	Wed Sep 22 16:51:17 2010 +0300
+++ b/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp	Wed Sep 22 15:40:40 2010 +0100
@@ -5,7 +5,7 @@
 #include <guestvideodriverinterfaceconstants.h>  //Registers and enums 
 #include <platformthreading.h>  //mutex
 #include <graphicsvhwcallback.h>
-#include "syborggraphicswrapper.h"
+#include "syborg-graphicswrapper.h"
 
 SyborgGraphicsWrapper::SyborgGraphicsWrapper()
     {															
--- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj	Wed Sep 22 16:51:17 2010 +0300
+++ b/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj	Wed Sep 22 15:40:40 2010 +0100
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)..\platsim_graphics\platsimvideodriver\commoninc;$(SolutionDir)..\PlatsimUtil\PlatsimUtil\inc\public;$(SolutionDir)..\KhronosAPIWrapper\inc;$(SolutionDir)..\platsim_graphics\serialiser\inc"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\..\..\..\adapt\graphics.simulator\hostsupport\hostthreadadapter\inc&quot;;&quot;$(SolutionDir)\..\..\..\..\..\os\graphics\graphics_plat\guestvideodriver_api\inc&quot;;&quot;$(SolutionDir)\..\..\..\..\..\adapt\graphics.simulator\holdingarea\serialization\Graphics\KhronosAPIWrapper\inc&quot;;&quot;$(SolutionDir)\..\..\..\..\..\adapt\graphics.simulator\guestrendering\vghwserialiser\inc&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;SYBORG_GRAPHICSWRAPPER_EXPORTS;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -133,9 +133,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="PlatsimUtil.lib KhronosApiWrapper.lib"
+				AdditionalDependencies="hostthreadadapter.lib KhronosApiWrapper.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)..\PlatsimUtil\PlatsimUtil\$(ConfigurationName);$(SolutionDir)..\KhronosAPIWrapper\$(ConfigurationName)"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\..\..\..\..\adapt\graphics.simulator\holdingarea\lib&quot;"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
FCL/sf/adapt/qemu