diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-01-04 14:55:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-04 14:55:37 +0300 |
| commit | 9ac2817fef9f77be3ccb50441e3cd87379680c61 (patch) | |
| tree | 439ad6052b0f9a8657b5e7b13ab6344623d34497 /source/nan_compile.mk | |
| parent | 5e58f5d4635dd4d4b38434643df5ede17f0e103f (diff) | |
some changes needed to get blender compiling with 64bit libs, use the systems Mesa now.
Diffstat (limited to 'source/nan_compile.mk')
| -rw-r--r-- | source/nan_compile.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk index a5f0dccce35..0c52a3e6014 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -171,10 +171,17 @@ ifeq ($(OS),openbsd) endif ifeq ($(OS),solaris) - CC = gcc - CCC = g++ -# CC = cc -# CCC = CC + # Adding gcc flag to $CC is not good, however if its not there makesdna wont build - Campbell + ifeq (x86_64, $(findstring x86_64, $(CPU))) + CC = gcc -m64 + CCC = g++ -m64 + else + CC = gcc + CCC = g++ + #CC = cc + #CCC = CC + endif + JAVAC = javac JAVAH = javah CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing @@ -182,6 +189,7 @@ ifeq ($(OS),solaris) # CFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned" # CCFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned" + # Note, you might still want to compile a 32 bit binary if you have a 64bit system. if so remove the following lines # ifeq ($(findstring 64,$(CPU)), 64) # CFLAGS += -m64 # CCFLAGS += -m64 @@ -198,7 +206,8 @@ ifeq ($(OS),solaris) JAVA_HEADERS = /usr/java/include JAVA_SYSTEM_HEADERS = /usr/java/include/solaris else - OPENGL_HEADERS = $(LCGDIR)/mesa/include + # OPENGL_HEADERS = /usr/X11/include/mesa + OPENGL_HEADERS = /usr/X11/include/ endif AR = ar ARFLAGS = ruv |