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.
This commit is contained in:
2006-01-16 22:27:30 +00:00
parent 4734a2db7e
commit 77c4eef90b
18 changed files with 28 additions and 5 deletions

View File

@@ -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',

View File

@@ -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"

View File

@@ -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>

View File

@@ -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

View File

@@ -38,6 +38,7 @@
#endif
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>

View File

@@ -41,6 +41,7 @@
#endif
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -47,7 +47,7 @@
#elif defined(__APPLE__)
# include <Carbon/Carbon.h>
# define GL_GLEXT_LEGACY 1
# include <OpenGL/gl.h>
#else /* UNIX */

View File

@@ -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

View File

@@ -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

View File

@@ -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>

View File

@@ -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

View File

@@ -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...