From 77c4eef90bf6a221838de64aa9aafbe95b30b264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Luc=20Peuri=C3=A8re?= Date: Mon, 16 Jan 2006 22:27:30 +0000 Subject: after much suffering, got GE build and work almost cleanly on Os X (with make, need to confirm with scons) after cleaning the changes are in fact minimal, but the situation is still quite a bit hackish. Game engine coders, there is also quite a number of warnings that need to be fixed. current situation is that everything seems to work, but GLSL shaders spew a lot of errors on console and blender may crash on exit when a GLSL shader was used. ARB stuff works fine. --- SConstruct | 2 +- source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 4 ++++ source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp | 1 + source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp | 1 + source/gameengine/GamePlayer/common/GPC_RenderTools.cpp | 1 + source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 1 + source/gameengine/Ketsji/BL_Shader.cpp | 1 + source/gameengine/Ketsji/BL_Texture.cpp | 1 + source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 1 + source/gameengine/Ketsji/KX_PythonInit.cpp | 1 + source/gameengine/Rasterizer/Makefile | 4 +++- source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile | 4 +++- .../Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp | 2 +- .../Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h | 2 ++ .../Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 1 + .../Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp | 1 + source/nan_compile.mk | 2 +- source/nan_definitions.mk | 3 +++ 18 files changed, 28 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 953234a432c..36f6aa7b7d8 100644 --- a/SConstruct +++ b/SConstruct @@ -176,7 +176,7 @@ elif sys.platform == 'darwin': fink_path = '/sw/' # TODO : try -mpowerpc -mpowerpc-gopt -mpowerpc-gfxopt optims # doing actual profiling - extra_flags = ['-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc', '-mtune=G4'] + extra_flags = ['-pipe', '-fPIC', '-funsigned-char', '-mpowerpc', '-mtune=G5'] # , '-malign-natural'] malign is causing problems with jpeg lib but worth a 1-2% speedup #'-force_cpusubtype_ALL', '-mpowerpc-gpopt', 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 #endif //WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #else #include 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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #include #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 #else #include 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 #include #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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #include #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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #include #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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #include #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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #include #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 - +# define GL_GLEXT_LEGACY 1 # include #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 # include # 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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #include #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 #endif // WIN32 #ifdef __APPLE__ +#define GL_GLEXT_LEGACY 1 #include #else #include diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 8386a6d9ea7..f64be26b621 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -80,7 +80,7 @@ endif ifeq ($(OS),darwin) CC = gcc CCC = g++ - CFLAGS += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=7450 + CFLAGS += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 CCFLAGS += -pipe -fPIC REL_CFLAGS += -O2 REL_CCFLAGS += -O2 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 1fa61ba718e..7a29aa2e724 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -170,6 +170,9 @@ endif export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit + export NAN_NO_KETSJI=false + + # Uncomment the following line to use Mozilla inplace of netscape # CPPFLAGS +=-DMOZ_NOT_NET # Location of MOZILLA/Netscape header files... -- cgit v1.2.3