projects / profile / ivi / clutter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1dd2853)
Visual C++ 2008 projects update
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 13 Dec 2011 05:07:46 +0000 (13:07 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 13 Dec 2011 05:07:46 +0000 (13:07 +0800)
Refines things a little bit from the last Visual C++ 2008 project updates.

build/win32/vs9/cally-atkcomponent-example.vcproj patch | blob | history
build/win32/vs9/cally-atkeditabletext-example.vcproj patch | blob | history
build/win32/vs9/cally-atkevents-example.vcproj patch | blob | history
build/win32/vs9/cally-atktext-example.vcproj patch | blob | history
build/win32/vs9/cally-clone-example.vcproj patch | blob | history
build/win32/vs9/clutter.vsprops patch | blob | history

diff --git a/build/win32/vs9/cally-atkcomponent-example.vcproj b/build/win32/vs9/cally-atkcomponent-example.vcproj
index f121358..3242b7e 100644 (file)
--- a/build/win32/vs9/cally-atkcomponent-example.vcproj
+++ b/build/win32/vs9/cally-atkcomponent-example.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -94,7 +94,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/cally-atkeditabletext-example.vcproj b/build/win32/vs9/cally-atkeditabletext-example.vcproj
index 90d3a90..b2316dc 100644 (file)
--- a/build/win32/vs9/cally-atkeditabletext-example.vcproj
+++ b/build/win32/vs9/cally-atkeditabletext-example.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -94,7 +94,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/cally-atkevents-example.vcproj b/build/win32/vs9/cally-atkevents-example.vcproj
index 58b9cec..d6bbed3 100644 (file)
--- a/build/win32/vs9/cally-atkevents-example.vcproj
+++ b/build/win32/vs9/cally-atkevents-example.vcproj
@@ -32,7 +32,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\clutter"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -62,7 +62,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\clutter"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -97,7 +97,7 @@
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
                                AdditionalIncludeDirectories="..\..\..\clutter"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -128,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\clutter"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/cally-atktext-example.vcproj b/build/win32/vs9/cally-atktext-example.vcproj
index 5219e24..22f4d6b 100644 (file)
--- a/build/win32/vs9/cally-atktext-example.vcproj
+++ b/build/win32/vs9/cally-atktext-example.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -94,7 +94,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/cally-clone-example.vcproj b/build/win32/vs9/cally-clone-example.vcproj
index 9b9cc28..7605fb1 100644 (file)
--- a/build/win32/vs9/cally-clone-example.vcproj
+++ b/build/win32/vs9/cally-clone-example.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="_DEBUG;$(CallyTestDefs)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -94,7 +94,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="$(CallyTestDefs);$(ClutterDisableDeprecationWarnings)"
+                               PreprocessorDefinitions="$(CallyTestDefs)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index 4ff0f2a..124d983 100644 (file)
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -51,18 +51,18 @@
                Value="$(BaseBuildDef);G_LOG_DOMAIN=\&quot;Clutter\&quot;;CLUTTER_PREFIX=\&quot;../\&quot;;CLUTTER_LIBDIR=\&quot;../lib\&quot;;CLUTTER_DATADIR=\&quot;../share\&quot;;CLUTTER_LOCALEDIR=\&quot;../share/locale\&quot;;CLUTTER_SYSCONFDIR=\&quot;../etc\&quot;"
        />
        <UserMacro
+               Name="ClutterDisableDeprecationWarnings"
+               Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
+       />
+       <UserMacro
                Name="CallyTestDefs"
-               Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;"
+               Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings)"
        />
        <UserMacro
                Name="TestProgDef"
                Value="$(BaseBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;"
        />
        <UserMacro
-               Name="ClutterDisableDeprecationWarnings"
-               Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
-       />
-       <UserMacro
                Name="TestPerfProgDef"
                Value="$(BaseBuildDef);TESTS_DATA_DIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;;$(ClutterDisableDeprecationWarnings)"
        />
Domain: Graphics System / Rendering Engine;