[cogl/msvc-support: 8/8] Update Visual C++ support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support: 8/8] Update Visual C++ support
- Date: Mon, 17 Oct 2011 07:49:59 +0000 (UTC)
commit 9e36cc1d062cf53dcbe9331e4025306643423a8c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Oct 17 15:49:42 2011 +0800
Update Visual C++ support
-Get rid of G_DISABLE_DEPRECATED from the build as warnings are now used
when deprecated GLib items are used instead.
-Update example source files as the filenames are changed
-Update example data path to be more like the standard GCC builds.
build/win32/vs10/cogl.props | 4 ++--
build/win32/vs10/crate.vcxproj | 10 +++++-----
build/win32/vs10/crate.vcxproj.filters | 2 +-
build/win32/vs10/hello.vcxproj | 2 +-
build/win32/vs10/hello.vcxproj.filters | 2 +-
build/win32/vs9/cogl.vsprops | 4 ++--
build/win32/vs9/crate.vcproj | 10 +++++-----
build/win32/vs9/hello.vcproj | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 952f68d..8d1a700 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -63,7 +63,7 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
copy ..\*.bat $(CopyDir)\bin
-copy ..\..\..\examples\*.jpg $(CopyDir)\bin
+copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data
mkdir $(CopyDir)\lib
@@ -196,7 +196,7 @@ copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<DisableSpecificWarnings>4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
diff --git a/build/win32/vs10/crate.vcxproj b/build/win32/vs10/crate.vcxproj
index 1fcb9c4..5ac18ec 100644
--- a/build/win32/vs10/crate.vcxproj
+++ b/build/win32/vs10/crate.vcxproj
@@ -71,7 +71,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="./";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -90,7 +90,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="./";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +114,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="./";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
@@ -133,7 +133,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="./";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -154,7 +154,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\crate.c" />
+ <ClCompile Include="..\..\..\examples\cogl-crate.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="cogl-pango.vcxproj">
diff --git a/build/win32/vs10/crate.vcxproj.filters b/build/win32/vs10/crate.vcxproj.filters
index a54fec7..512afe1 100644
--- a/build/win32/vs10/crate.vcxproj.filters
+++ b/build/win32/vs10/crate.vcxproj.filters
@@ -7,7 +7,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\crate.c">
+ <ClCompile Include="..\..\..\examples\cogl-crate.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
diff --git a/build/win32/vs10/hello.vcxproj b/build/win32/vs10/hello.vcxproj
index 46a5916..6186a91 100644
--- a/build/win32/vs10/hello.vcxproj
+++ b/build/win32/vs10/hello.vcxproj
@@ -196,7 +196,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\hello.c" />
+ <ClCompile Include="..\..\..\examples\cogl-hello.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="cogl.vcxproj">
diff --git a/build/win32/vs10/hello.vcxproj.filters b/build/win32/vs10/hello.vcxproj.filters
index b13334d..84c9a46 100644
--- a/build/win32/vs10/hello.vcxproj.filters
+++ b/build/win32/vs10/hello.vcxproj.filters
@@ -7,7 +7,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\hello.c">
+ <ClCompile Include="..\..\..\examples\cogl-hello.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index ae7460a..ba0fe50 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -9,7 +9,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
- PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED"
+ PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
DisableSpecificWarnings="4819"
/>
@@ -90,7 +90,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&
copy ..\*.bat $(OutDir)\bin

-copy ..\..\..\examples\crate.jpg $(OutDir)\bin

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

mkdir $(OutDir)\lib

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

diff --git a/build/win32/vs9/crate.vcproj b/build/win32/vs9/crate.vcproj
index 00dd18f..b66ef7a 100644
--- a/build/win32/vs9/crate.vcproj
+++ b/build/win32/vs9/crate.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"./\";$(BaseBuildDefines)"
+ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(CoglApiVersion)/examples-data\";$(BaseBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -60,7 +60,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"./\";$(BaseBuildDefines)"
+ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(CoglApiVersion)/examples-data\";$(BaseBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -94,7 +94,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"./\";$(BaseBuildDefines)"
+ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(CoglApiVersion)/examples-data\";$(BaseBuildDefines)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"./\";$(BaseBuildDefines)"
+ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(CoglApiVersion)/examples-data\";$(BaseBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -153,7 +153,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\crate.c" />
+ <File RelativePath="..\..\..\examples\cogl-crate.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/hello.vcproj b/build/win32/vs9/hello.vcproj
index 3250f3d..c860f0d 100644
--- a/build/win32/vs9/hello.vcproj
+++ b/build/win32/vs9/hello.vcproj
@@ -149,7 +149,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\hello.c" />
+ <File RelativePath="..\..\..\examples\cogl-hello.c" />
</Filter>
</Files>
<Globals>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
