From f2d785e22b752daba50443348075c25511d9466a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 26 Aug 2013 18:39:02 +0800 Subject: [PATCH] Visual Studio Projects: Use Custom Build Rules Use custom build rules to generate the enumeration sources and the .def files so that the IDE will regenerate those files upon change and clean them when a clean up request is requested. --- build/win32/vs10/cogl-pango.vcxproj.filtersin | 3 + build/win32/vs10/cogl-pango.vcxprojin | 28 ++- build/win32/vs10/cogl.vcxproj.filtersin | 5 + build/win32/vs10/cogl.vcxprojin | 104 +++++++-- build/win32/vs9/cogl-pango.vcprojin | 46 ++-- build/win32/vs9/cogl.vcprojin | 206 +++++++++++++++--- 6 files changed, 308 insertions(+), 84 deletions(-) diff --git a/build/win32/vs10/cogl-pango.vcxproj.filtersin b/build/win32/vs10/cogl-pango.vcxproj.filtersin index 4e22b74c1..48d7d45d4 100644 --- a/build/win32/vs10/cogl-pango.vcxproj.filtersin +++ b/build/win32/vs10/cogl-pango.vcxproj.filtersin @@ -13,4 +13,7 @@ #include "coglpango.vs10.sourcefiles.filters" + + Resource Files + \ No newline at end of file diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin index 22888c115..9698c0250 100644 --- a/build/win32/vs10/cogl-pango.vcxprojin +++ b/build/win32/vs10/cogl-pango.vcxprojin @@ -82,9 +82,6 @@ Level3 EditAndContinue - - $(GenerateCoglPangoDef) - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -110,9 +107,6 @@ Level3 ProgramDatabase - - $(GenerateCoglPangoDef) - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -138,9 +132,6 @@ Level3 ProgramDatabase - - $(GenerateCoglPangoDef) - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -165,9 +156,6 @@ Level3 ProgramDatabase - - $(GenerateCoglPangoDef) - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -183,6 +171,22 @@ #include "coglpango.vs10.sourcefiles" + + + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + + diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin index e9529147c..963c23887 100644 --- a/build/win32/vs10/cogl.vcxproj.filtersin +++ b/build/win32/vs10/cogl.vcxproj.filtersin @@ -29,4 +29,9 @@ Sources\Driver_GL Sources\Driver_GL + + Resource Files + Resource Files + Resource Files + \ No newline at end of file diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index 0b3e2c9a4..6121ebca0 100644 --- a/build/win32/vs10/cogl.vcxprojin +++ b/build/win32/vs10/cogl.vcxprojin @@ -143,9 +143,6 @@ Level3 EditAndContinue - - $(GenerateCoglDef) - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -175,9 +172,6 @@ Level3 EditAndContinue - - $(GenerateCoglSDLDef) - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -207,9 +201,6 @@ Level3 ProgramDatabase - - $(GenerateCoglDef) - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -239,9 +230,6 @@ Level3 ProgramDatabase - - $(GenerateCoglSDLDef) - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -271,9 +259,6 @@ Level3 ProgramDatabase - - $(GenerateCoglDef) - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -305,9 +290,6 @@ Level3 ProgramDatabase - - $(GenerateCoglSDLDef) - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -336,9 +318,6 @@ Level3 ProgramDatabase - - $(GenerateCoglDef) - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -367,9 +346,6 @@ Level3 ProgramDatabase - - $(GenerateCoglSDLDef) - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll @@ -408,6 +384,86 @@ + + + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + + + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + + + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + + diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin index 44bd7f179..d4c7a2567 100644 --- a/build/win32/vs9/cogl-pango.vcprojin +++ b/build/win32/vs9/cogl-pango.vcprojin @@ -40,10 +40,6 @@ WarningLevel="3" DebugInformationFormat="4" /> - - - - + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin index 5469713be..f5002a044 100644 --- a/build/win32/vs9/cogl.vcprojin +++ b/build/win32/vs9/cogl.vcprojin @@ -44,10 +44,6 @@ $(PreBuildCmd) WarningLevel="3" DebugInformationFormat="4" /> - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +