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 eacac3d65f7c9e410a74d7247e6b28826fedcae7..05cb81fb9acf8a5d88f58b28ced2ee995ac99c47 100644 (file)
--- 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 bea4557a00efcb10a01b091e34729d9206ca7cb3..0b70c2f4224859d291ce0e3cf918ccec59c0adca 100644 (file)
--- 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 d97964085ee75c0f40c5a4fe13aa178119f443e7..031f2b473cc1520684eeb49f9193061ee9e2d5c5 100644 (file)
--- 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");