diff options
Diffstat (limited to 'source/gameengine')
15 files changed, 23 insertions, 3 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 028dcbe4601..4dbddaf2d62 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -42,6 +42,10 @@ #pragma warning (disable:4786) #endif +#ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 +#endif + #include "KX_BlenderGL.h" #include "KX_BlenderCanvas.h" #include "KX_BlenderKeyboardDevice.h" diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index a100c3aaa0a..8f93ad1a0aa 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -36,6 +36,7 @@ #include <windows.h> #endif //WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #else #include <GL/gl.h> diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index dc714fb5fb6..9cad9fcf932 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp @@ -38,6 +38,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index 3d81046e8e9..9bc01e1408e 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -38,6 +38,7 @@ #endif #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #else #include <GL/gl.h> diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index c5324776edb..2ab98750881 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -41,6 +41,7 @@ #endif #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index 4cc01f820cf..981f96928d5 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -3,6 +3,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 6595d5ee12a..2b01d3df560 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -3,6 +3,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index cbb52133813..ace68a823a8 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -10,6 +10,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index ba4f0e55615..6f7b73ee4fa 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -39,6 +39,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/Rasterizer/Makefile b/source/gameengine/Rasterizer/Makefile index 6a1421ae90b..5f8eace8adb 100644 --- a/source/gameengine/Rasterizer/Makefile +++ b/source/gameengine/Rasterizer/Makefile @@ -42,7 +42,9 @@ CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../kernel/gen_system - +ifeq ($(OS),darwin) + CPPFLAGS += -fpascal-strings +endif ############### SOURCEDIR = source/gameengine/Rasterizer diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile index c03aab3422e..40f3fc50005 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile @@ -44,4 +44,6 @@ CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../../kernel/gen_system CPPFLAGS += -I.. - +ifeq ($(OS),darwin) + CPPFLAGS += -fpascal-strings +endif diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index 2b47acb2e32..af3a9bca03e 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -47,7 +47,7 @@ #elif defined(__APPLE__) # include <Carbon/Carbon.h> - +# define GL_GLEXT_LEGACY 1 # include <OpenGL/gl.h> #else /* UNIX */ diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index 9f81f48b6be..a5dad19222b 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -39,6 +39,7 @@ #elif defined(__APPLE__) # define __glext_h_ +# define GL_GLEXT_LEGACY 1 # include <OpenGL/gl.h> # include <OpenGL/glu.h> # undef __glext_h_ @@ -52,6 +53,7 @@ #endif #include "glext.h" + #include "EXT_separate_specular_color.h" #include "ARB_multitexture.h" namespace bgl diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 8acd5168bd9..38dfb7836b2 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -41,6 +41,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp index 77beed5ead1..b6d8e74c2d5 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp @@ -38,6 +38,7 @@ #include <windows.h> #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include <OpenGL/gl.h> #else #include <GL/gl.h> |