From c0e9d9235a0e1c96f6ff25e77fb60a65eb8ddc38 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 28 Sep 2012 17:14:28 +0800 Subject: [PATCH] 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 11070a7ed..673c07a10 100644 --- a/build/win32/vs10/cogl-pango.vcxprojin +++ b/build/win32/vs10/cogl-pango.vcxprojin @@ -88,7 +88,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl-pango\cogl-pango.def + $(IntDir)\cogl-pango.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -116,7 +116,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl-pango\cogl-pango.def + $(IntDir)\cogl-pango.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -144,7 +144,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl-pango\cogl-pango.def + $(IntDir)\cogl-pango.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -171,7 +171,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl-pango\cogl-pango.def + $(IntDir)\cogl-pango.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 3880a50dc..5a1bcb6d2 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -12,6 +12,7 @@ G_LOG_DOMAIN="Cogl-Pango" COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests" $(GlibEtcInstallRoot) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ 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 - 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 - 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 - 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 lib @@ -238,6 +243,12 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio $(GlibEtcInstallRoot) + + $(CopyDir) + + + $(DefDir) + $(GlibMkEnumsPath) diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index 86ffdd239..de173efe3 100644 --- a/build/win32/vs10/cogl.vcxprojin +++ b/build/win32/vs10/cogl.vcxprojin @@ -149,7 +149,7 @@ opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -181,7 +181,7 @@ SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -213,7 +213,7 @@ opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -245,7 +245,7 @@ SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -277,7 +277,7 @@ opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -311,7 +311,7 @@ SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -342,7 +342,7 @@ opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows @@ -373,7 +373,7 @@ SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - ..\..\..\cogl\cogl.def + $(IntDir)\cogl.def $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib true Windows diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin index b0353dcc7..2bc159091 100644 --- a/build/win32/vs9/cogl-pango.vcprojin +++ b/build/win32/vs9/cogl-pango.vcprojin @@ -22,7 +22,6 @@ @@ -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 @@ @@ -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 @@ @@ -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 06403a6ee..2fc03af6f 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 81be0c8f5..99e79b3da 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -21,6 +21,14 @@ Name="GlibEtcInstallRoot" Value="..\..\..\..\vs9\$(PlatformName)" /> + +