[gtkmm/gtkmm-2-24] Fix the Visual Studio 2008/2010 Projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-2-24] Fix the Visual Studio 2008/2010 Projects
- Date: Fri, 19 Sep 2014 06:12:01 +0000 (UTC)
commit 23bf83296e92ad83db0f67bc41915df427c5ec64
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Sep 19 14:11:49 2014 +0800
Fix the Visual Studio 2008/2010 Projects
Remove the /vd2 compile-time option, as it causes crashes in the built
binaries, and define a MSVC-compatible getc_unlocked() replacement.
* MSVC_Net2008/gdkmm/gdkmm.vcproj:
* MSVC_Net2008/gtkmm/gtkmm.vcproj:
* MSVC_Net2010/gdkmm/gdkmm.vcxproj:
* MSVC_Net2010/gtkmm/gtkmm.vcxproj: Remove the /vd2 compile option, as it
is not needed and causes crashes in the built code.
* MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj:
* MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj: Remove the /vd2
compile option, and define a getc_unlocked() replacement suitable
for Visual Studio builds.
MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj | 12 ++++--------
MSVC_Net2008/gdkmm/gdkmm.vcproj | 4 ----
MSVC_Net2008/gtkmm/gtkmm.vcproj | 4 ----
MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj | 12 ++++--------
MSVC_Net2010/gdkmm/gdkmm.vcxproj | 4 ----
MSVC_Net2010/gtkmm/gtkmm.vcxproj | 4 ----
6 files changed, 8 insertions(+), 32 deletions(-)
---
diff --git a/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj b/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj
index 80f264b..7d4f726 100644
--- a/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj
+++ b/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj
@@ -44,10 +44,9 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories=".;../../gtkmm;../../gdkmm;"$(SolutionDir)/../atk";"$(SolutionDir)/../gdk";"$(SolutionDir)/../gtk""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -126,9 +125,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
AdditionalIncludeDirectories=".;../../gtkmm;../../gdkmm;"$(SolutionDir)/../atk";"$(SolutionDir)/../gdk";"$(SolutionDir)/../gtk""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@@ -207,10 +205,9 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories=".;../../gtkmm;../../gdkmm;"$(SolutionDir)/../atk";"$(SolutionDir)/../gdk";"$(SolutionDir)/../gtk""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -290,9 +287,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
AdditionalIncludeDirectories=".;../../gtkmm;../../gdkmm;"$(SolutionDir)/../atk";"$(SolutionDir)/../gdk";"$(SolutionDir)/../gtk""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
diff --git a/MSVC_Net2008/gdkmm/gdkmm.vcproj b/MSVC_Net2008/gdkmm/gdkmm.vcproj
index ecac9c1..a7ee5d5 100644
--- a/MSVC_Net2008/gdkmm/gdkmm.vcproj
+++ b/MSVC_Net2008/gdkmm/gdkmm.vcproj
@@ -43,7 +43,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories=".;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDKMM_BUILD"
@@ -124,7 +123,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
AdditionalIncludeDirectories=".;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
RuntimeLibrary="2"
@@ -202,7 +200,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories=".;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDKMM_BUILD"
@@ -285,7 +282,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
AdditionalIncludeDirectories=".;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
RuntimeLibrary="2"
diff --git a/MSVC_Net2008/gtkmm/gtkmm.vcproj b/MSVC_Net2008/gtkmm/gtkmm.vcproj
index ae7b4fe..b28493b 100644
--- a/MSVC_Net2008/gtkmm/gtkmm.vcproj
+++ b/MSVC_Net2008/gtkmm/gtkmm.vcproj
@@ -44,7 +44,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories=".;../../atk;../gdkmm;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD"
@@ -126,7 +125,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
AdditionalIncludeDirectories=".;../../atk;../../pango;../gdkmm;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD"
RuntimeLibrary="2"
@@ -205,7 +203,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories=".;../../atk;../gdkmm;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD"
@@ -289,7 +286,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/vd2"
AdditionalIncludeDirectories=".;../../atk;../../pango;../gdkmm;../../gdk;../../gtk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD"
RuntimeLibrary="2"
diff --git a/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj b/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj
index c6fb088..0abf06e 100644
--- a/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj
+++ b/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj
@@ -82,10 +82,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../gtkmm;../../gdkmm;$(SolutionDir)/../atk;$(SolutionDir)/../gdk;$(SolutionDir)/../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -110,9 +109,8 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.;../../gtkmm;../../gdkmm;$(SolutionDir)/../atk;$(SolutionDir)/../gdk;$(SolutionDir)/../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@@ -139,10 +137,9 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../gtkmm;../../gdkmm;$(SolutionDir)/../atk;$(SolutionDir)/../gdk;$(SolutionDir)/../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -170,9 +167,8 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.;../../gtkmm;../../gdkmm;$(SolutionDir)/../atk;$(SolutionDir)/../gdk;$(SolutionDir)/../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;getc_unlocked=_fgetc_nolock;HAVE_GETC_UNLOCKED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
diff --git a/MSVC_Net2010/gdkmm/gdkmm.vcxproj b/MSVC_Net2010/gdkmm/gdkmm.vcxproj
index fc03296..d36d611 100644
--- a/MSVC_Net2010/gdkmm/gdkmm.vcxproj
+++ b/MSVC_Net2010/gdkmm/gdkmm.vcxproj
@@ -81,7 +81,6 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GDKMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -110,7 +109,6 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -138,7 +136,6 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GDKMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -171,7 +168,6 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff --git a/MSVC_Net2010/gtkmm/gtkmm.vcxproj b/MSVC_Net2010/gtkmm/gtkmm.vcxproj
index 16eb2e3..a63c05d 100644
--- a/MSVC_Net2010/gtkmm/gtkmm.vcxproj
+++ b/MSVC_Net2010/gtkmm/gtkmm.vcxproj
@@ -82,7 +82,6 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../atk;../gdkmm;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -112,7 +111,6 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.;../../atk;../../pango;../gdkmm;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -141,7 +139,6 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../atk;../gdkmm;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -175,7 +172,6 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.;../../atk;../../pango;../gdkmm;../../gdk;../../gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
