From fe1aeed5aa76aaefcbff66c7d60768d8f83c7748 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 30 Dec 2003 02:28:13 +0000 Subject: [PATCH] Three supported win32 compilation environments: MSVC, Cygwin and MingW32 The windows mmsystem header need only be included internally to freeglut strdup vs _strdup is specific to the MS compiler git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@430 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_internal.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 7205e7f..cea8ad8 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -36,12 +36,12 @@ /* * Freeglut is meant to be available under all Unix/X11 and Win32 platforms. */ -#if !defined(_WIN32) -# define TARGET_HOST_UNIX_X11 1 -# define TARGET_HOST_WIN32 0 -#else +#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) # define TARGET_HOST_UNIX_X11 0 # define TARGET_HOST_WIN32 1 +#else +# define TARGET_HOST_UNIX_X11 1 +# define TARGET_HOST_WIN32 0 #endif #define FREEGLUT_MAX_MENUS 3 @@ -61,7 +61,10 @@ #if TARGET_HOST_WIN32 #include #include +#include +#endif +#if defined(_MSC_VER) #define strdup _strdup #endif -- 1.7.10.4