[cogl/cogl-1.12] Update Visual C++ projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.12] Update Visual C++ projects
- Date: Fri, 28 Sep 2012 09:16:58 +0000 (UTC)
commit c0e9d9235a0e1c96f6ff25e77fb60a65eb8ddc38
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Sep 28 17:14:28 2012 +0800
Update Visual C++ projects
-Make "install" parts for VS9 and VS10 more consistent with each other
-Create the .def files in the respective intermediate/.obj folders, so that
it is cleaner duringg the build
-Make up for missed files to "install"
build/win32/vs10/cogl-pango.vcxprojin | 8 +-
build/win32/vs10/cogl.props | 23 ++++--
build/win32/vs10/cogl.vcxprojin | 16 ++--
build/win32/vs9/cogl-pango.vcprojin | 12 +--
build/win32/vs9/cogl.vcprojin | 16 ++--
build/win32/vs9/cogl.vsprops | 160 +++++++++++++++++---------------
6 files changed, 126 insertions(+), 109 deletions(-)
---
diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 11070a7..673c07a 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -88,7 +88,7 @@
<Link>
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -116,7 +116,7 @@
<Link>
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -144,7 +144,7 @@
<Link>
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -171,7 +171,7 @@
<Link>
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl-pango\cogl-pango.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 3880a50..5a1bcb6 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -12,6 +12,7 @@
<CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
<TestProgDef>COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+ <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
<DoDefinesSDL>
if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H
if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H
@@ -114,6 +115,8 @@ copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cog
copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
@@ -181,6 +184,8 @@ copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
@@ -193,21 +198,21 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
</CoglDoInstall>
<GenerateCoglDef>
- echo EXPORTS > ..\..\..\cogl\cogl.def
+ echo EXPORTS > $(DefDir)\cogl.def
- cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def
+ cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def
</GenerateCoglDef>
<GenerateCoglSDLDef>
- echo EXPORTS > ..\..\..\cogl\cogl.def
+ echo EXPORTS > $(DefDir)\cogl.def
- cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def
+ cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def
</GenerateCoglSDLDef>
<GenerateCoglPangoDef>
- echo EXPORTS > ..\..\..\cogl-pango\cogl-pango.def
+ echo EXPORTS > $(DefDir)\cogl-pango.def
- cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> ..\..\..\cogl-pango\cogl-pango.def
+ cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> $(DefDir)\cogl-pango.def
</GenerateCoglPangoDef>
<CoglLibtoolCompatibleDllPrefix>lib</CoglLibtoolCompatibleDllPrefix>
@@ -238,6 +243,12 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
+ <BuildMacro Include="CopyDir">
+ <Value>$(CopyDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="DefDir">
+ <Value>$(DefDir)</Value>
+ </BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibMkEnumsPath)</Value>
</BuildMacro>
diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin
index 86ffdd2..de173ef 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -149,7 +149,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -181,7 +181,7 @@
<Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -213,7 +213,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -245,7 +245,7 @@
<Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -277,7 +277,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -311,7 +311,7 @@
<Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -342,7 +342,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -373,7 +373,7 @@
<Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\cogl\cogl.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index b0353dc..2bc1590 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -22,7 +22,6 @@
<Configuration
Name="Debug|Win32"
InheritedPropertySheets=".\cogl.vsprops"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
ConfigurationType="2"
CharacterSet="2"
>
@@ -50,7 +49,7 @@
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+ ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -60,7 +59,6 @@
<Configuration
Name="Debug|x64"
InheritedPropertySheets=".\cogl.vsprops"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
ConfigurationType="2"
CharacterSet="2"
>
@@ -88,7 +86,7 @@
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+ ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -98,7 +96,6 @@
<Configuration
Name="Release|Win32"
InheritedPropertySheets=".\cogl.vsprops"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -127,7 +124,7 @@
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+ ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -139,7 +136,6 @@
<Configuration
Name="Release|x64"
InheritedPropertySheets=".\cogl.vsprops"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango"
ConfigurationType="2"
CharacterSet="2"
>
@@ -164,7 +160,7 @@
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl-pango\cogl-pango.def"
+ ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin
index 06403a6..2fc03af 100644
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@@ -53,7 +53,7 @@ $(PreBuildCmd)
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -95,7 +95,7 @@ $(PreBuildCmd)
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -136,7 +136,7 @@ $(PreBuildCmd)
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -178,7 +178,7 @@ $(PreBuildCmd)
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -220,7 +220,7 @@ $(PreBuildCmd)
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -265,7 +265,7 @@ $(PreBuildCmd)
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -305,7 +305,7 @@ $(PreBuildCmd)
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -346,7 +346,7 @@ $(PreBuildCmd)
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\cogl\cogl.def"
+ ModuleDefinitionFile="$(IntDir)\cogl.def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 81be0c8..99e79b3 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -22,6 +22,14 @@
Value="..\..\..\..\vs9\$(PlatformName)"
/>
<UserMacro
+ Name="CopyDir"
+ Value="$(GlibEtcInstallRoot)"
+ />
+ <UserMacro
+ Name="DefDir"
+ Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+ />
+ <UserMacro
Name="GlibMkEnumsPath"
Value="..\..\..\vs9\$(PlatformName)"
/>
@@ -100,103 +108,105 @@ cd .\vs9

<UserMacro
Name="CoglDoInstall"
Value="
-mkdir $(OutDir)

-mkdir $(OutDir)\bin

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin

+mkdir $(CopyDir)

+mkdir $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

-copy ..\*.bat $(OutDir)\bin

+copy ..\*.bat $(CopyDir)\bin

-mkdir $(OutDir)\share\cogl-$(CoglApiVersion)\examples-data

-copy ..\..\..\examples\crate.jpg $(OutDir)\share\cogl-$(CoglApiVersion)\examples-data

+mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data

+copy ..\..\..\examples\crate.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data

-mkdir $(OutDir)\lib

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(CoglApiVersion).lib $(OutDir)\lib

+mkdir $(CopyDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(CoglApiVersion).lib $(CopyDir)\lib

-mkdir $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-mkdir $(OutDir)\include\cogl-$(CoglApiVersion)\cogl-pango

-copy ..\..\..\cogl-pango\cogl-pango.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl-pango

-copy ..\..\..\cogl\cogl-object.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-attribute-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-bitmap.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-color.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-deprecated.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-depth-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-euler.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-fixed.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-glib-source.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-material-compat.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-pipeline.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-quaternion.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-vector.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-matrix.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-offscreen.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-onscreen.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-primitives.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-path.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-path-functions.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-pipeline-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-pixel-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-poll.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-shader.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-snippet.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-texture-2d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-sub-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-texture-rectangle.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-meta-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-texture-3d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-types.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-vertex-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-index-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-indices.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-attribute.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-primitive.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-clip-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-framebuffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-clutter.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-defines.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-enum-types.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango

+copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango

+copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-renderer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-swap-chain.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-onscreen-template.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-display.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-context.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl-win32-renderer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl1-context.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl2-path.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl2-experimental.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

-copy ..\..\..\cogl\cogl2-compatibility.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

-mkdir $(OutDir)\share\cogl-$(CoglApiVersion)\tests

-copy ..\..\..\tests\data\valgrind.suppressions $(OutDir)\share\cogl-$(CoglApiVersion)\tests

+mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\tests

+copy ..\..\..\tests\data\valgrind.suppressions $(CopyDir)\share\cogl-$(CoglApiVersion)\tests

"
/>
<UserMacro
Name="GenerateCoglDef"
Value="
- echo EXPORTS > ..\..\..\cogl\cogl.def

- cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def

+ echo EXPORTS > $(DefDir)\cogl.def

+ cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def

"
/>
<UserMacro
Name="GenerateCoglSDLDef"
Value="
- echo EXPORTS > ..\..\..\cogl\cogl.def

- cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def

+ echo EXPORTS > $(DefDir)\cogl.def

+ cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def

"
/>
<UserMacro
Name="GenerateCoglPangoDef"
Value="
- echo EXPORTS > ..\..\..\cogl-pango\cogl-pango.def

- cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> ..\..\..\cogl-pango\cogl-pango.def

+ echo EXPORTS > $(DefDir)\cogl-pango.def

+ cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> $(DefDir)\cogl-pango.def

"
/>
<UserMacro
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
