From: Brian Paul Date: Mon, 8 Nov 2004 15:08:48 +0000 (+0000) Subject: Remove need for defining _MSC_VER when building Mesa for windows with X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83889ffd970a807074d834849677fd233c031dc7;p=mesa.git Remove need for defining _MSC_VER when building Mesa for windows with a non MS C compiler (MinGW). (Gregor Anich) --- diff --git a/include/GL/gl.h b/include/GL/gl.h index 0bf4cd8097d..d9c6e30eb24 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -53,9 +53,9 @@ #endif #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern diff --git a/include/GL/glut.h b/include/GL/glut.h index 3a67f1f560d..7977dc94c92 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -75,7 +75,7 @@ extern "C" { To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */ /* XXX This is from Win32's */ -# if !defined(_MSC_VER) && !defined(__cdecl) +# if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__cdecl) /* Define __cdecl for non-Microsoft compilers. */ # define __cdecl # define GLUT_DEFINED___CDECL @@ -108,7 +108,7 @@ extern _CRTIMP void __cdecl exit(int); and redifinition of Windows system defs, also removes requirement of pretty much any standard windows header from this file */ -#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) +#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) # define GLUTAPIENTRY __stdcall #else # define GLUTAPIENTRY diff --git a/include/GL/mesa_wgl.h b/include/GL/mesa_wgl.h index a331bb3514b..21473763ed5 100644 --- a/include/GL/mesa_wgl.h +++ b/include/GL/mesa_wgl.h @@ -32,7 +32,7 @@ #define _mesa_wgl_h_ -#include +#include #ifdef __cplusplus extern "C" { @@ -40,10 +40,10 @@ extern "C" { #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # define WGLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ diff --git a/include/GL/wmesa.h b/include/GL/wmesa.h index 79b3c823029..0a6e8b64246 100644 --- a/include/GL/wmesa.h +++ b/include/GL/wmesa.h @@ -50,7 +50,7 @@ extern "C" { #endif -#include "gl\gl.h" +#include "GL/gl.h" #if defined(_MSV_VER) && !defined(__GNUC__) # pragma warning (disable:4273) diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw index 336463ec78f..80145e50f52 100644 --- a/src/mesa/Makefile.mgw +++ b/src/mesa/Makefile.mgw @@ -71,7 +71,7 @@ endif LDLIBS = -lgdi32 CC = mingw32-gcc -CFLAGS += -DBUILD_GL32 -D_OPENGL32_ -D_MSC_VER +CFLAGS += -DBUILD_GL32 -D_OPENGL32_ CFLAGS += $(INCLUDE_DIRS) CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1 ifeq ($(FX),1) diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c index 96cfafff4c3..acd5f4a34fb 100644 --- a/src/mesa/drivers/windows/gdi/wmesa.c +++ b/src/mesa/drivers/windows/gdi/wmesa.c @@ -18,7 +18,7 @@ * Updated for Mesa 4.0 by Karl Schultz (kschultz@sourceforge.net) */ -#ifdef NDEBUG +#if defined(NDEBUG) && defined(_MSC_VER) #pragma auto_inline(on) #pragma inline_depth(255) #pragma inline_recursion(on) @@ -74,7 +74,7 @@ /* Stereo and parallel not tested for Mesa 4.0. */ #define NO_STEREO #if !defined(NO_STEREO) -#include "gl\glu.h" +#include "GL/glu.h" #include "stereo.h" #endif @@ -114,6 +114,8 @@ WMesaContext WC = NULL; #if defined(_MSC_VER) && _MSC_VER >= 1200 #define FORCEINLINE __forceinline +#elif defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#define FORCEINLINE __attribute__((always_inline)) #else #define FORCEINLINE __inline #endif diff --git a/src/mesa/drivers/windows/gdi/wmesadef.h b/src/mesa/drivers/windows/gdi/wmesadef.h index 3c267aa0f6a..d43e990ed3c 100644 --- a/src/mesa/drivers/windows/gdi/wmesadef.h +++ b/src/mesa/drivers/windows/gdi/wmesadef.h @@ -70,7 +70,7 @@ #include -#include +#include #include "context.h" #ifdef DDRAW #define DIRECTDRAW_VERSION 0x0100 diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 3057770d095..5068e90c609 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -98,10 +98,10 @@ # pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ # endif # endif -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # define WGLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */