From: rpolzer <rpolzer@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Fri, 21 Nov 2008 10:53:43 +0000 (+0000)
Subject: win32 font fix, win32 build fix by ingar
X-Git-Tag: svn-r421~290
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=eb8babab1ac7fc64eb2c38bd5882b6327194bae1;p=xonotic%2Fnetradiant.git

win32 font fix, win32 build fix by ingar


git-svn-id: svn://svn.icculus.org/netradiant/trunk@130 61c419a2-8eb2-4b30-bcec-8cead039b335
---

diff --git a/libs/str.h b/libs/str.h
index eacac3d6..05cb81fb 100644
--- a/libs/str.h
+++ b/libs/str.h
@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdio>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #define strcasecmp strcmpi
 #if _MSC_VER < 1400 
 #define vsnprintf std::vsnprintf
diff --git a/libs/xml/xmlparser.h b/libs/xml/xmlparser.h
index bea4557a..0b70c2f4 100644
--- a/libs/xml/xmlparser.h
+++ b/libs/xml/xmlparser.h
@@ -99,7 +99,7 @@ public:
   }
 };
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #if _MSC_VER < 1400 
 #define vsnprintf std::vsnprintf
 #endif
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index d9796408..031f2b47 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -3304,7 +3304,9 @@ void GlobalGL_sharedContextCreated()
   GlobalShaderCache().realise();
   Textures_Realise();
 
-#ifdef __linux__
+#if defined(WIN32)
+  g_font = glfont_create("courier new 8");
+#elif defined(__linux__)
   g_font = glfont_create("fixed 8");
 #else
   g_font = glfont_create("courier 8");