[gtk+/gtk-2-24] Visual Studio builds: Fix the Debug configs



commit 7674fc9683b8f16362d5e066881be7aa1630e932
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 18 17:26:40 2013 +0800

    Visual Studio builds: Fix the Debug configs
    
    The debug builds must link to the Debug version of the CRT, otherwise
    trouble will arise due to the mixing of different CRTs

 build/win32/vs10/gdk-win32.vcxproj |    5 +----
 build/win32/vs10/gdk.vcxprojin     |    3 +--
 build/win32/vs10/gtk-demo.vcxproj  |    3 +--
 build/win32/vs10/gtk.vcxprojin     |    2 +-
 build/win32/vs9/gdk-win32.vcproj   |    2 +-
 build/win32/vs9/gdk.vcprojin       |    2 +-
 build/win32/vs9/gtk-demo.vcproj    |    2 +-
 build/win32/vs9/gtk.vcprojin       |    2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/build/win32/vs10/gdk-win32.vcxproj b/build/win32/vs10/gdk-win32.vcxproj
index 9e1f8a5..6a3a4c1 100644
--- a/build/win32/vs10/gdk-win32.vcxproj
+++ b/build/win32/vs10/gdk-win32.vcxproj
@@ -60,9 +60,6 @@
     <Import Project="gtk+.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -70,7 +67,7 @@
       
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin
index 03e56f4..fc1dd3d 100644
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -61,7 +61,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
@@ -74,7 +73,7 @@
       
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
diff --git a/build/win32/vs10/gtk-demo.vcxproj b/build/win32/vs10/gtk-demo.vcxproj
index 491eaef..8a78aeb 100644
--- a/build/win32/vs10/gtk-demo.vcxproj
+++ b/build/win32/vs10/gtk-demo.vcxproj
@@ -63,7 +63,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -76,7 +75,7 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index da5218e..1dae43d 100644
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -74,7 +74,7 @@
       
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcproj
index 72330eb..920b9f2 100644
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -35,7 +35,7 @@
                                PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="4"
diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index becbbff..0764f0b 100644
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -35,7 +35,7 @@
                                PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="4"
diff --git a/build/win32/vs9/gtk-demo.vcproj b/build/win32/vs9/gtk-demo.vcproj
index 222d72e..54c92fa 100644
--- a/build/win32/vs9/gtk-demo.vcproj
+++ b/build/win32/vs9/gtk-demo.vcproj
@@ -35,7 +35,7 @@
                                PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="4"
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 0864763..54516c4 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -35,7 +35,7 @@
                                PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="4"


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