GNOME.org
 

[clutter/clutter-1.18] Visual Studio Builds: Avoid Implicit Linking to SDL

commit 20e619f8a68b29421463a76c87b767bdf4fd0414
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Apr 17 10:52:19 2014 +0800

    Visual Studio Builds: Avoid Implicit Linking to SDL
    
    Cogl, when built with the SDL winsys, will include the SDL headers when
    Cogl-based programs are built, which causes the SDL's wrapper for main()
    to be used on Windows, causing an implicit requirement that all Cogl-based
    apps must link to SDL2.lib and SDL2main.lib.  Avoid this behavior by
    defining SDL_MAIN_HANDLED in the CFLAGS of the sample and interactive test
    programs

 build/win32/vs10/clutter-build-defines.props  |    8 ++++++--
 build/win32/vs10/test-cogl-perf.vcxproj       |    8 ++++----
 build/win32/vs10/test-picking.vcxproj         |    8 ++++----
 build/win32/vs10/test-random-text.vcxproj     |    8 ++++----
 build/win32/vs10/test-text-perf.vcxproj       |    8 ++++----
 build/win32/vs10/test-text.vcxproj            |    8 ++++----
 build/win32/vs9/clutter-build-defines.vsprops |    8 ++++++--
 build/win32/vs9/test-cogl-perf.vcproj         |    8 ++++----
 build/win32/vs9/test-picking.vcproj           |    8 ++++----
 build/win32/vs9/test-random-text.vcproj       |    8 ++++----
 build/win32/vs9/test-text-perf.vcproj         |    8 ++++----
 build/win32/vs9/test-text.vcproj              |    8 ++++----
 12 files changed, 52 insertions(+), 44 deletions(-)
---
diff --git a/build/win32/vs10/clutter-build-defines.props b/build/win32/vs10/clutter-build-defines.props
index 6b93aa5..8fb7ae6 100644
--- a/build/win32/vs10/clutter-build-defines.props
+++ b/build/win32/vs10/clutter-build-defines.props
@@ -10,8 +10,9 @@
     
<ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
     
<ClutterBuildDefines>$(BaseWinBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS</ClutterBuildDefines>
     
<ClutterDisableDeprecationWarnings>CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS</ClutterDisableDeprecationWarnings>
-    
<CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings)</CallyTestDefs>
-    
<TestProgDef>$(BaseWinBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data";TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data"</TestProgDef>
+    <AvoidSDLMain>SDL_MAIN_HANDLED</AvoidSDLMain>
+    
<CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)</CallyTestDefs>
+    
<TestProgDef>$(BaseWinBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data";TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data";$(AvoidSDLMain)</TestProgDef>
     <TestPerfProgDef>$(TestProgDef);$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
   </PropertyGroup>
   <PropertyGroup>
@@ -50,6 +51,9 @@
     <BuildMacro Include="ClutterDisableDeprecationWarnings">
       <Value>$(ClutterDisableDeprecationWarnings)</Value>
     </BuildMacro>
+    <BuildMacro Include="AvoidSDLMain">
+      <Value>$(AvoidSDLMain)</Value>
+    </BuildMacro>
     <BuildMacro Include="CallyTestDefs">
       <Value>$(CallyTestDefs)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/test-cogl-perf.vcxproj b/build/win32/vs10/test-cogl-perf.vcxproj
index 4d37ce6..0017cf8 100644
--- a/build/win32/vs10/test-cogl-perf.vcxproj
+++ b/build/win32/vs10/test-cogl-perf.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -117,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -135,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs10/test-picking.vcxproj b/build/win32/vs10/test-picking.vcxproj
index d8a23c9..f33e9f5 100644
--- a/build/win32/vs10/test-picking.vcxproj
+++ b/build/win32/vs10/test-picking.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -136,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs10/test-random-text.vcxproj b/build/win32/vs10/test-random-text.vcxproj
index 98c4c6e..50d5825 100644
--- a/build/win32/vs10/test-random-text.vcxproj
+++ b/build/win32/vs10/test-random-text.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -117,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -135,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs10/test-text-perf.vcxproj b/build/win32/vs10/test-text-perf.vcxproj
index de12d15..24160a7 100644
--- a/build/win32/vs10/test-text-perf.vcxproj
+++ b/build/win32/vs10/test-text-perf.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -117,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -135,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs10/test-text.vcxproj b/build/win32/vs10/test-text.vcxproj
index 1583c55..3fad712 100644
--- a/build/win32/vs10/test-text.vcxproj
+++ b/build/win32/vs10/test-text.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -117,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -135,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs9/clutter-build-defines.vsprops b/build/win32/vs9/clutter-build-defines.vsprops
index 3da652c..829161b 100644
--- a/build/win32/vs9/clutter-build-defines.vsprops
+++ b/build/win32/vs9/clutter-build-defines.vsprops
@@ -31,12 +31,16 @@
                Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
        />
        <UserMacro
+               Name="AvoidSDLMain"
+               Value="SDL_MAIN_HANDLED"
+       />
+       <UserMacro
                Name="CallyTestDefs"
-               
Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings)"
+               
Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
        />
        <UserMacro
                Name="TestProgDef"
-               
Value="$(BaseWinBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;TESTS_DATA_DIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;"
+               
Value="$(BaseWinBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;TESTS_DATA_DIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;$(AvoidSDLMain)"
        />
        <UserMacro
                Name="TestPerfProgDef"
diff --git a/build/win32/vs9/test-cogl-perf.vcproj b/build/win32/vs9/test-cogl-perf.vcproj
index e35b18d..9326e64 100644
--- a/build/win32/vs9/test-cogl-perf.vcproj
+++ b/build/win32/vs9/test-cogl-perf.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -59,7 +59,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -93,7 +93,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -122,7 +122,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/test-picking.vcproj b/build/win32/vs9/test-picking.vcproj
index 9a00f2f..f635e9c 100644
--- a/build/win32/vs9/test-picking.vcproj
+++ b/build/win32/vs9/test-picking.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -94,7 +94,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -123,7 +123,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/test-random-text.vcproj b/build/win32/vs9/test-random-text.vcproj
index c9fc13f..f8b5d8e 100644
--- a/build/win32/vs9/test-random-text.vcproj
+++ b/build/win32/vs9/test-random-text.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -59,7 +59,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -93,7 +93,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -122,7 +122,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/test-text-perf.vcproj b/build/win32/vs9/test-text-perf.vcproj
index f441084..3854514 100644
--- a/build/win32/vs9/test-text-perf.vcproj
+++ b/build/win32/vs9/test-text-perf.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -59,7 +59,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -93,7 +93,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -122,7 +122,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
diff --git a/build/win32/vs9/test-text.vcproj b/build/win32/vs9/test-text.vcproj
index a729be1..56f5a3d 100644
--- a/build/win32/vs9/test-text.vcproj
+++ b/build/win32/vs9/test-text.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -59,7 +59,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -93,7 +93,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -122,7 +122,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+                               
PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]