From 7b02ff54703f2be772af08669c38e338deea1e33 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Wed, 31 Aug 2005 13:10:40 +0000 Subject: [PATCH] Implementing WATCOM support git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@681 7f0cb862-5218-0410-a997-914c9d46530a --- include/GL/freeglut_std.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index f5723e0..8fd65d8 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -35,7 +35,7 @@ /* * Under windows, we have to differentiate between static and dynamic libraries */ -#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__) /* #pragma may not be supported by some compilers. * Discussion by FreeGLUT developers suggests that @@ -56,7 +56,7 @@ # define FGAPIENTRY /* Link with Win32 static freeglut lib */ -# if defined(_MSC_VER) +# if defined(_MSC_VER) || defined(__WATCOMC__) # pragma comment (lib, "freeglut_static.lib") # endif @@ -69,7 +69,7 @@ # define FGAPI __declspec(dllimport) /* link with Win32 shared freeglut lib */ -# if defined(_MSC_VER) +# if defined(_MSC_VER) || defined(__WATCOMC__) # ifndef _WIN32_WCE # pragma comment (lib, "freeglut.lib") # endif @@ -82,7 +82,7 @@ # endif /* Drag in other Windows libraries as required by FreeGLUT */ -# if defined(_MSC_VER) +# if defined(_MSC_VER) || defined(__WATCOMC__) # ifndef _WIN32_WCE # pragma comment (lib, "winmm.lib") /* link Windows MultiMedia lib */ # pragma comment (lib, "user32.lib") /* link Windows user lib */ @@ -183,7 +183,7 @@ * * Steve Baker suggested to make it binary compatible with GLUT: */ -#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__) # define GLUT_STROKE_ROMAN ((void *)0x0000) # define GLUT_STROKE_MONO_ROMAN ((void *)0x0001) # define GLUT_BITMAP_9_BY_15 ((void *)0x0002) -- 1.7.10.4