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 faff442e3510d4d6c5009c4f74af2a96e8dd1ff8..f44aca8a16e33ec3ad179de0536c676d00cfbabd 100644 (file)
--- 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 e562107c311b89cc44fe246dd74a29a52f12f1a7..a74076ea4d638c8b2d5dc24b8932872751d5a925 100755 (executable)
--- a/radiant/radiant_VC9.vcproj
+++ b/radiant/radiant_VC9.vcproj
@@ -62,7 +62,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
-                               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;"\r
+                               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;"\r
                                GenerateDebugInformation="true"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
@@ -135,7 +135,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
-                               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;"\r
+                               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;"\r
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
@@ -996,11 +996,11 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"\r
+                                       RelativePath=".\gtkmisc.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\gtkmisc.h"\r
+                                       RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -2412,10 +2412,6 @@
                <Filter\r
                        Name="Misc"\r
                        >\r
-                       <File\r
-                               RelativePath="..\..\src\gtk+\gtk\makefile.msc"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\glib\makefile.msc"\r
                                >\r
@@ -2428,6 +2424,10 @@
                                RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\gtk+\gtk\makefile.msc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <File\r
                        RelativePath="..\setup\changelog.txt"\r