From 8d7a9d606a767232e5e7b8f7b607ce3486dbd1cd Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 26 Aug 2013 18:18:17 +0800 Subject: Update Visual Studio Property Sheets -Add items to generate the enumeration sources -Add items to build the CoglPath library, which was split out --- build/win32/vs10/cogl.props | 68 ++++++++++++++++++++++++++++++++++++++++---- build/win32/vs9/cogl.vsprops | 52 +++++++++++++++++++++++++++++---- 2 files changed, 109 insertions(+), 11 deletions(-) (limited to 'build') diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index efbe5f36..05bd60e3 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -2,7 +2,7 @@ 10 - ..\..\..\..\vs$(VSVer)\$(Platform) + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) ..\..\..\vs$(VSVer)\$(Platform) 1.0 _WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG @@ -10,6 +10,7 @@ $(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS _DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" + G_LOG_DOMAIN="CoglPath" G_LOG_DOMAIN="Cogl-Pango" COGL_COMPILATION $(GlibEtcInstallRoot) @@ -42,16 +43,56 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h :DONE_CONFIG_H if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h + + +if exist ..\..\..\cogl-path\cogl-path-enum-types.h goto DONE_COGLPATH_ENUMS_H -cd .. +cd ..\..\..\cogl-path -gen-enums.bat $(GlibEtcInstallRootFromBuildWin32) +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.h.in cogl-path-types.h cogl1-path-functions.h > cogl-path-enum-types.h -cd .\vs$(VSVer) +cd $(SolutionDir) +:DONE_COGLPATH_ENUMS_H + + + +if exist ..\..\..\cogl-path\cogl-path-enum-types.c goto DONE_COGLPATH_ENUMS_C + +cd ..\..\..\cogl-path + +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.c.in cogl-path-types.h cogl1-path-functions.h > cogl-path-enum-types.c + +cd $(SolutionDir) + +:DONE_COGLPATH_ENUMS_C + + + +if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H + +cd ..\..\..\cogl + +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in cogl1-context.h cogl-bitmap.h cogl-color.h cogl-fixed.h cogl-material-compat.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-shader.h cogl-texture.h cogl-types.h cogl-vertex-buffer.h cogl-clutter.h cogl.h cogl-win32-renderer.h > cogl-enum-types.h + +cd $(SolutionDir) + +:DONE_COGL_ENUMS_H + + + +if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C + +cd ..\..\..\cogl + +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in cogl1-context.h cogl-bitmap.h cogl-color.h cogl-fixed.h cogl-material-compat.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-shader.h cogl-texture.h cogl-types.h cogl-vertex-buffer.h cogl-clutter.h cogl.h cogl-win32-renderer.h > cogl-enum-types.c + +cd $(SolutionDir) + +:DONE_COGL_ENUMS_C + - mkdir $(CopyDir) @@ -84,6 +125,8 @@ copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl +copy ..\..\..\cogl\cogl-atlas-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl @@ -300,6 +343,9 @@ cd vs$(VSVer) $(CoglBuildDefines) + + $(CoglPathBuildDefines) + $(CoglPangoBuildDefines) @@ -315,6 +361,18 @@ cd vs$(VSVer) $(PreBuildCmd) + + $(GenCoglPathEnumsH) + + + $(GenCoglPathEnumsC) + + + $(GenCoglEnumsH) + + + $(GenCoglEnumsC) + $(CoglDoInstall) diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index ed252db5..a001bd56 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -23,7 +23,7 @@ /> + + + + +