forked from bartvdbraak/blender
some changes needed to get blender compiling with 64bit libs, use the systems Mesa now.
This commit is contained in:
parent
5e58f5d463
commit
9ac2817fef
@ -53,11 +53,16 @@
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#if defined (__sun) || defined (__sun__)
|
||||
#include <GL/gl.h>
|
||||
#include <mesa/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
#endif
|
||||
/*
|
||||
* these should be phased out. cpack should be replaced in
|
||||
|
@ -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
|
||||
|
@ -482,7 +482,7 @@ endif
|
||||
export NAN_TIFF ?= /usr
|
||||
export NAN_ODE ?= $(LCGDIR)/ode
|
||||
export NAN_TERRAPLAY ?=
|
||||
export NAN_MESA ?= $(LCGDIR)/mesa
|
||||
export NAN_MESA ?= /usr/X11
|
||||
export NAN_ZLIB ?= $(LCGDIR)/zlib
|
||||
export NAN_NSPR ?= $(LCGDIR)/nspr
|
||||
export NAN_FREETYPE ?= $(LCGDIR)/freetype
|
||||
|
@ -119,8 +119,12 @@ endif
|
||||
ifeq ($(OS),solaris)
|
||||
ifeq (x86_64, $(findstring x86_64, $(CPU)))
|
||||
LLIBS = -lrt
|
||||
LLIBS += -L$(NAN_MESA)/lib/amd64
|
||||
else
|
||||
LLIBS += -L$(NAN_MESA)/lib
|
||||
endif
|
||||
LLIBS += -L$(NAN_MESA)/lib -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
|
||||
|
||||
LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
|
||||
DYNLDFLAGS = -shared $(LDFLAGS)
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user