From 5c3690719c99cb9436c1f8a46d2627f89c6b1719 Mon Sep 17 00:00:00 2001
From: timo <timo@8a3a26a2-13c4-0310-b231-cf6edde360e5>
Date: Fri, 24 Dec 2010 19:04:32 +0000
Subject: [PATCH] misc project file fixes from trunk (e.g. rev 345). fixes the
 'missing MSVCR90.DLL' absurdity

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/Rambetter-temp-fixes@357 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
 contrib/camera/camera.def             |  1 -
 contrib/camera/camera_VC9.vcproj      |  6 ++++--
 plugins/entity/entity.def             |  1 -
 plugins/entity/entity_VC9.vcproj      |  2 ++
 plugins/image/image.def               |  1 -
 plugins/image/image_VC9.vcproj        |  1 +
 plugins/imagepng/imagepng.def         |  1 -
 plugins/imagepng/imagepng_VC9.vcproj  |  2 ++
 plugins/map/map.def                   |  3 +--
 plugins/map/map_VC9.vcproj            |  2 ++
 plugins/mapxml/mapxml.def             |  1 -
 plugins/mapxml/mapxml_VC9.vcproj      |  2 ++
 plugins/model/model.def               |  1 -
 plugins/model/model_VC9.vcproj        |  2 ++
 plugins/shaders/shaders.def           |  1 -
 plugins/shaders/shaders_VC9.vcproj    |  2 ++
 plugins/surface/surface.def           |  1 -
 plugins/surface/surface_VC9.vcproj    |  6 ++++--
 plugins/vfspk3/vfspk3.def             |  1 -
 plugins/vfspk3/vfspk3_VC9.vcproj      |  2 ++
 radiant/file.cpp                      |  2 +-
 radiant/gtkdlgs.cpp                   |  2 +-
 radiant/mainframe.cpp                 |  2 +-
 radiant/preferences.cpp               | 13 ++++++++++---
 radiant/radiant_VC9.vcproj            | 20 ++++++++++----------
 tools/quake3/q3map2/q3map2_VC9.vcproj |  1 +
 26 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/contrib/camera/camera.def b/contrib/camera/camera.def
index 6a597438..ddec12c7 100644
--- a/contrib/camera/camera.def
+++ b/contrib/camera/camera.def
@@ -1,7 +1,6 @@
 ; camera.def : Declares the module parameters for the DLL.
 
 LIBRARY      "CAMERA"
-DESCRIPTION  'CAMERA Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/contrib/camera/camera_VC9.vcproj b/contrib/camera/camera_VC9.vcproj
index e10dbd77..bf1b24cd 100755
--- a/contrib/camera/camera_VC9.vcproj
+++ b/contrib/camera/camera_VC9.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -115,7 +115,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/entity/entity.def b/plugins/entity/entity.def
index 6c40d040..b6ccf57d 100644
--- a/plugins/entity/entity.def
+++ b/plugins/entity/entity.def
@@ -1,7 +1,6 @@
 ; entity.def : Declares the module parameters for the DLL.
 
 LIBRARY      "ENTITY"
-DESCRIPTION  'ENTITY Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/entity/entity_VC9.vcproj b/plugins/entity/entity_VC9.vcproj
index ae78d297..2206d770 100755
--- a/plugins/entity/entity_VC9.vcproj
+++ b/plugins/entity/entity_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/image/image.def b/plugins/image/image.def
index 77635858..26d413c7 100644
--- a/plugins/image/image.def
+++ b/plugins/image/image.def
@@ -1,7 +1,6 @@
 ; image.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Image"
-DESCRIPTION  'Image Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/image/image_VC9.vcproj b/plugins/image/image_VC9.vcproj
index 965512a3..d5f78f60 100755
--- a/plugins/image/image_VC9.vcproj
+++ b/plugins/image/image_VC9.vcproj
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
 				AdditionalDependencies=" synapse.lib libxml2.lib glib-2.0.lib gobject-2.0.lib libjpeg.lib"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;;&quot;$(SolutionDir)\..\jpeg-6b&quot;"
 				ModuleDefinitionFile="image.def"
diff --git a/plugins/imagepng/imagepng.def b/plugins/imagepng/imagepng.def
index cc876885..64f59c0d 100644
--- a/plugins/imagepng/imagepng.def
+++ b/plugins/imagepng/imagepng.def
@@ -1,7 +1,6 @@
 ; imagepng.def : Declares the module parameters for the DLL.
 
 LIBRARY      "IMAGEPNG"
-DESCRIPTION  'IMAGEPNG Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/imagepng/imagepng_VC9.vcproj b/plugins/imagepng/imagepng_VC9.vcproj
index 49ed1534..25419289 100755
--- a/plugins/imagepng/imagepng_VC9.vcproj
+++ b/plugins/imagepng/imagepng_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/map/map.def b/plugins/map/map.def
index 80a9c861..3f16e0ed 100644
--- a/plugins/map/map.def
+++ b/plugins/map/map.def
@@ -1,7 +1,6 @@
 ; mapq3.def : Declares the module parameters for the DLL.
 
-LIBRARY      "MAPQ3"
-DESCRIPTION  'MAPQ3 Windows Dynamic Link Library'
+LIBRARY      "MAP"
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/map/map_VC9.vcproj b/plugins/map/map_VC9.vcproj
index f7d7c894..52617f01 100755
--- a/plugins/map/map_VC9.vcproj
+++ b/plugins/map/map_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/mapxml/mapxml.def b/plugins/mapxml/mapxml.def
index feca2974..5835ac80 100644
--- a/plugins/mapxml/mapxml.def
+++ b/plugins/mapxml/mapxml.def
@@ -1,7 +1,6 @@
 ; mapxml.def : Declares the module parameters for the DLL.
 
 LIBRARY      "MAPXML"
-DESCRIPTION  'MAPXML Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/mapxml/mapxml_VC9.vcproj b/plugins/mapxml/mapxml_VC9.vcproj
index ab492ecb..82e793b1 100755
--- a/plugins/mapxml/mapxml_VC9.vcproj
+++ b/plugins/mapxml/mapxml_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/model/model.def b/plugins/model/model.def
index 01cee0f0..7f3bb9e9 100644
--- a/plugins/model/model.def
+++ b/plugins/model/model.def
@@ -1,7 +1,6 @@
 ; model.def : Declares the module parameters for the DLL.
 
 LIBRARY      "MODEL"
-DESCRIPTION  'MODEL Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/model/model_VC9.vcproj b/plugins/model/model_VC9.vcproj
index 32747868..3faf9921 100755
--- a/plugins/model/model_VC9.vcproj
+++ b/plugins/model/model_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/shaders/shaders.def b/plugins/shaders/shaders.def
index 3f3b6a1e..9d8e0b87 100644
--- a/plugins/shaders/shaders.def
+++ b/plugins/shaders/shaders.def
@@ -1,7 +1,6 @@
 ; shaders.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Shaders"
-DESCRIPTION  'Shaders Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/shaders/shaders_VC9.vcproj b/plugins/shaders/shaders_VC9.vcproj
index 67415312..d8fc96a0 100755
--- a/plugins/shaders/shaders_VC9.vcproj
+++ b/plugins/shaders/shaders_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/surface/surface.def b/plugins/surface/surface.def
index 23328e4a..73043309 100644
--- a/plugins/surface/surface.def
+++ b/plugins/surface/surface.def
@@ -1,7 +1,6 @@
 ; surface.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE"
-DESCRIPTION  'SURFACE Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/surface/surface_VC9.vcproj b/plugins/surface/surface_VC9.vcproj
index 95bc261a..9f10e5aa 100755
--- a/plugins/surface/surface_VC9.vcproj
+++ b/plugins/surface/surface_VC9.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -115,7 +115,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/plugins/vfspk3/vfspk3.def b/plugins/vfspk3/vfspk3.def
index d4c34e7f..aa414654 100644
--- a/plugins/vfspk3/vfspk3.def
+++ b/plugins/vfspk3/vfspk3.def
@@ -1,7 +1,6 @@
 ; vfspk3.def : Declares the module parameters for the DLL.
 
 LIBRARY      "VFSPK3"
-DESCRIPTION  'VFSPK3 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/vfspk3/vfspk3_VC9.vcproj b/plugins/vfspk3/vfspk3_VC9.vcproj
index 6255ecec..24b06b9b 100755
--- a/plugins/vfspk3/vfspk3_VC9.vcproj
+++ b/plugins/vfspk3/vfspk3_VC9.vcproj
@@ -115,6 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
@@ -140,6 +141,7 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
diff --git a/radiant/file.cpp b/radiant/file.cpp
index 5d051ca1..b0c66ed6 100644
--- a/radiant/file.cpp
+++ b/radiant/file.cpp
@@ -244,7 +244,7 @@ bool FileStream::Open(const char *filename, const char *mode)
   m_hFile = fopen(filename, mode);
   m_bCloseOnDelete = true;
 
-  return (m_hFile != NULL);
+  return m_hFile != NULL;
 }
 
 void MemStream::Close()
diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index d87f2919..43ebe40a 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -2841,7 +2841,7 @@ void DoCommandListDlg ()
       cmds = g_slist_sort (cmds, (gint (*)(const void *, const void *))strcmp);
 
       Sys_Printf("Writing the command list to %s", path.GetBuffer() );
-      FILE* fileout = fopen (path.GetBuffer (), "wt");
+      FILE * fileout = fopen( path.GetBuffer (), "wt" );
 
       while (cmds)
       {
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 493520f0..7f7dba22 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -7079,7 +7079,7 @@ void MainFrame::OnSelectFuncGroup()
 	// check to see if the selected brush is part of a func group
 	// if it is, deselect everything and reselect the next brush 
 	// in the group
-	brush_t *b2, *b = selected_brushes.next;
+	brush_t *b = selected_brushes.next;
 	entity_t * e;
 	if (b != &selected_brushes)
 	{
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 821f44c3..03486fd8 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -39,6 +39,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "missing.h"
 #include "gtkmisc.h"
 
+#ifdef _WIN32
+	// sanity check - some gtk2 win32 runtimes replace sprintf
+	#if defined( sprintf )
+		#error sprintf is a macro. are you sure?
+	#endif
+#endif
+
 #ifdef _WIN32
 #include <io.h>
 #define X_OK 0
@@ -3359,7 +3366,7 @@ void CGameInstall::BuildDialog() {
 
 void CGameInstall::Run() {
 	ScanGames();
-	if (m_availGames[0] == GAME_NONE) {
+	if ( m_availGames[0] == GAME_NONE ) {
 		return;
 	}
 	if ( DoModal() == IDCANCEL ) {
@@ -3375,8 +3382,8 @@ void CGameInstall::Run() {
 	gameFilePath += ".game";
 	Sys_Printf( "game file: %s\n", gameFilePath.GetBuffer() );
 
-	FILE *fg = fopen( gameFilePath.GetBuffer(), "w" );
-	if ( fg == NULL || ferror( fg ) ) {
+	FILE * fg = fopen( gameFilePath.GetBuffer(), "w" );
+	if ( fg == NULL ) {
 		Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
 	}
 	fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );
diff --git a/radiant/radiant_VC9.vcproj b/radiant/radiant_VC9.vcproj
index 403705d1..9f8c8cfb 100755
--- a/radiant/radiant_VC9.vcproj
+++ b/radiant/radiant_VC9.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;;&quot;$(SolutionDir)\..\fontconfig-dev_2.8.0-2_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include\freetype2&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\freetype2&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -61,8 +61,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib pangoft2-1.0.lib"
-				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
+				AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib pangoft2-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.2.0\lib&quot;"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;;&quot;$(SolutionDir)\..\fontconfig-dev_2.8.0-2_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include\freetype2&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\freetype2&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -134,8 +134,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib pangoft2-1.0.lib"
-				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
+				AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib pangoft2-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.2.0\lib&quot;"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -2413,19 +2413,19 @@
 			Name="Misc"
 			>
 			<File
-				RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"
+				RelativePath="..\..\src\glib\makefile.msc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\gtk+\gtk\makefile.msc"
+				RelativePath="..\..\src\gtk+\gdk\makefile.msc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\glib\makefile.msc"
+				RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\gtk+\gdk\makefile.msc"
+				RelativePath="..\..\src\gtk+\gtk\makefile.msc"
 				>
 			</File>
 		</Filter>
diff --git a/tools/quake3/q3map2/q3map2_VC9.vcproj b/tools/quake3/q3map2/q3map2_VC9.vcproj
index 989e00c6..2c4799bf 100755
--- a/tools/quake3/q3map2/q3map2_VC9.vcproj
+++ b/tools/quake3/q3map2/q3map2_VC9.vcproj
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
 				AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libjpeg.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\jpeg-6b&quot;;&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
 				GenerateDebugInformation="true"
-- 
2.39.2