[cogl/cogl-1.16] Update Visual Studio Property Sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.16] Update Visual Studio Property Sheets
- Date: Mon, 26 Aug 2013 10:18:27 +0000 (UTC)
commit 8d7a9d606a767232e5e7b8f7b607ce3486dbd1cd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Aug 26 18:18:17 2013 +0800
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(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index efbe5f3..05bd60e 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
<ApiVersion>1.0</ApiVersion>
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
@@ -10,6 +10,7 @@
<ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
<DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
<CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>
+ <CoglPathBuildDefines>G_LOG_DOMAIN="CoglPath"</CoglPathBuildDefines>
<CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
<TestProgDef>COGL_COMPILATION</TestProgDef>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
@@ -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
+ </PreBuildCmd>
+<GenCoglPathEnumsH>
+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
+</GenCoglPathEnumsH>
+
+<GenCoglPathEnumsC>
+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
+</GenCoglPathEnumsC>
+
+<GenCoglEnumsH>
+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
+</GenCoglEnumsH>
+
+<GenCoglEnumsC>
+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
+</GenCoglEnumsC>
- </PreBuildCmd>
<CoglDoInstall>
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)
<BuildMacro Include="CoglBuildDefines">
<Value>$(CoglBuildDefines)</Value>
</BuildMacro>
+ <BuildMacro Include="CoglPathBuildDefines">
+ <Value>$(CoglPathBuildDefines)</Value>
+ </BuildMacro>
<BuildMacro Include="CoglPangoBuildDefines">
<Value>$(CoglPangoBuildDefines)</Value>
</BuildMacro>
@@ -315,6 +361,18 @@ cd vs$(VSVer)
<BuildMacro Include="PreBuildCmd">
<Value>$(PreBuildCmd)</Value>
</BuildMacro>
+ <BuildMacro Include="GenCoglPathEnumsH">
+ <Value>$(GenCoglPathEnumsH)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GenCoglPathEnumsC">
+ <Value>$(GenCoglPathEnumsC)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GenCoglEnumsH">
+ <Value>$(GenCoglEnumsH)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GenCoglEnumsC">
+ <Value>$(GenCoglEnumsC)</Value>
+ </BuildMacro>
<BuildMacro Include="CoglDoInstall">
<Value>$(CoglDoInstall)</Value>
</BuildMacro>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index ed252db..a001bd5 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -23,7 +23,7 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="GlibEtcInstallRootFromBuildWin32"
@@ -62,6 +62,10 @@
Value="G_LOG_DOMAIN=\"Cogl\";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME=\"\";COGL_LOCALEDIR=\"/some/random/dir\""
/>
<UserMacro
+ Name="CoglPathBuildDefines"
+ Value="G_LOG_DOMAIN=\"CoglPath\""
+ />
+ <UserMacro
Name="CoglPangoBuildDefines"
Value="G_LOG_DOMAIN=\"Cogl-Pango\""
/>
@@ -102,14 +106,49 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H

copy ..\..\..\config.h.win32 ..\..\..\config.h

if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32
..\..\..\cogl\cogl-gl-header.h

:DONE_CONFIG_H

-
-cd ..

-gen-enums.bat $(GlibEtcInstallRootFromBuildWin32)

-cd .\vs$(VSVer)

-
"
/>
<UserMacro
+ Name="GenCoglPathEnumsH"
+ Value="
+if exist ..\..\..\cogl-path\cogl-path-enum-types.h goto DONE_COGLPATH_ENUMS_H

+cd ..\..\..\cogl-path

+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 $(SolutionDir)

+:DONE_COGLPATH_ENUMS_H

+ "
+ />
+ <UserMacro
+ Name="GenCoglPathEnumsC"
+ Value="
+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

+ "
+ />
+ <UserMacro
+ Name="GenCoglEnumsH"
+ Value="
+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

+ "
+ />
+ <UserMacro
+ Name="GenCoglEnumsC"
+ Value="
+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

+ "
+ />
+ <UserMacro
Name="CoglDoInstall"
Value="
mkdir $(CopyDir)

@@ -130,6 +169,7 @@ mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl

mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango

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

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

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

[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
