From: TTimo <ttimo@ttimo.net>
Date: Mon, 13 Dec 2010 05:37:08 +0000 (+0000)
Subject: damn macro is still there
X-Git-Tag: xonotic-v0.7.0~16^2~12^2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09337b89929d4ee67f0bbe680bb06ac199a6f231;p=xonotic%2Fnetradiant.git

damn macro is still there

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@347 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index faff442e..f44aca8a 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -40,10 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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
+#undef fprintf
 #endif
 
 #ifdef _WIN32
diff --git a/radiant/radiant_VC9.vcproj b/radiant/radiant_VC9.vcproj
index e562107c..a74076ea 100755
--- a/radiant/radiant_VC9.vcproj
+++ b/radiant/radiant_VC9.vcproj
@@ -62,7 +62,7 @@
 			<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 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;"
+				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"
@@ -135,7 +135,7 @@
 			<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 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;"
+				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"
@@ -996,11 +996,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"
+					RelativePath=".\gtkmisc.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gtkmisc.h"
+					RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"
 					>
 				</File>
 				<File
@@ -2412,10 +2412,6 @@
 		<Filter
 			Name="Misc"
 			>
-			<File
-				RelativePath="..\..\src\gtk+\gtk\makefile.msc"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\glib\makefile.msc"
 				>
@@ -2428,6 +2424,10 @@
 				RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\gtk+\gtk\makefile.msc"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\setup\changelog.txt"