forked from bartvdbraak/blender
==SCons==
* when WITH_BF_STATICOPENGL=1 on Linux Blender will be statically linked against GL libraries. NOTE: I used values that worked on my machine - platform managers and people who have better knowledge about this, please modify config/linux2-config.py accordingly.
This commit is contained in:
parent
a2a2ad98e2
commit
11fd198a70
@ -103,7 +103,7 @@ BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
|
||||
WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
|
||||
|
||||
# Mesa Libs should go here if your using them as well....
|
||||
WITH_BF_OPENGL = 'true'
|
||||
WITH_BF_STATICOPENGL = 'true'
|
||||
BF_OPENGL_LIB = 'GL GLU'
|
||||
BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
|
||||
BF_OPENGL_LINKFLAGS = '-framework OpenGL'
|
||||
|
@ -96,12 +96,13 @@ BF_QUICKTIME = '/usr/local'
|
||||
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
|
||||
|
||||
# Mesa Libs should go here if your using them as well....
|
||||
WITH_BF_OPENGL = 'true'
|
||||
BF_OPENGL = '/usr/X11R6'
|
||||
WITH_BF_STATICOPENGL = 'false'
|
||||
BF_OPENGL = '/usr/lib'
|
||||
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
||||
BF_OPENGL_LIB = 'GL GLU X11 Xi'
|
||||
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
|
||||
BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/lib/libGL.a ${BF_OPENGL}/lib/libGLU.a ${BF_OPENGL}/lib/libX11.a ${BF_OPENGL}/lib/libXi.a'
|
||||
BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
|
||||
|
||||
##
|
||||
##CC = gcc
|
||||
##CCC = g++
|
||||
|
@ -94,7 +94,7 @@ BF_QUICKTIME = '/usr/local'
|
||||
BF_QUICKTIME_INC = BF_QUICKTIME + '/include'
|
||||
|
||||
# Mesa Libs should go here if your using them as well....
|
||||
WITH_BF_OPENGL = 'true'
|
||||
WITH_BF_STATICOPENGL = 'true'
|
||||
BF_OPENGL = '/usr/X11R6'
|
||||
BF_OPENGL_INC = BF_OPENGL + '/include'
|
||||
BF_OPENGL_LIB = 'GL GLU Xmu Xext X11 Xi'
|
||||
|
@ -104,7 +104,7 @@ BF_QUICKTIME = '/usr/local'
|
||||
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
|
||||
|
||||
# Mesa Libs should go here if your using them as well....
|
||||
WITH_BF_OPENGL = 'true'
|
||||
WITH_BF_STATICOPENGL = 'true'
|
||||
BF_OPENGL = 'C:\\MingW'
|
||||
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
||||
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
|
||||
|
@ -111,7 +111,7 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
|
||||
BF_QUICKTIME_LIB = 'qtmlClient'
|
||||
BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
|
||||
|
||||
WITH_BF_OPENGL = 'true'
|
||||
WITH_BF_STATICOPENGL = 'true'
|
||||
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
||||
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
|
||||
BF_OPENGL_LIB = 'opengl32 glu32'
|
||||
|
@ -121,6 +121,9 @@ def setup_staticlibs(lenv):
|
||||
if lenv['WITH_BF_OPENAL']:
|
||||
libincs += Split(lenv['BF_OPENAL_LIBPATH'])
|
||||
|
||||
if lenv['WITH_BF_STATICOPENGL']:
|
||||
statlibs += Split(lenv['BF_OPENGL_LIB_STATIC'])
|
||||
|
||||
return statlibs, libincs
|
||||
|
||||
def setup_syslibs(lenv):
|
||||
@ -142,6 +145,7 @@ def setup_syslibs(lenv):
|
||||
if lenv['WITH_BF_FFMPEG']:
|
||||
syslibs += Split(lenv['BF_FFMPEG_LIB'])
|
||||
syslibs += Split(lenv['BF_SDL_LIB'])
|
||||
if not lenv['WITH_BF_STATICOPENGL']:
|
||||
syslibs += Split(lenv['BF_OPENGL_LIB'])
|
||||
syslibs += Split(lenv['LLIBS'])
|
||||
|
||||
|
@ -33,7 +33,7 @@ def validate_arguments(args, bc):
|
||||
'BF_SOLID', 'BF_SOLID_INC',
|
||||
'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH',
|
||||
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
|
||||
'WITH_BF_OPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS',
|
||||
'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS',
|
||||
'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
|
||||
'WITH_BF_FFMPEG',
|
||||
'WITH_BF_PLAYER',
|
||||
@ -218,7 +218,7 @@ def read_opts(cfg, args):
|
||||
('BF_QUICKTIME_LIB', 'QuickTime library', ''),
|
||||
('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''),
|
||||
|
||||
(BoolOption('WITH_BF_OPENGL', 'Use MESA if true', 'true')),
|
||||
(BoolOption('WITH_BF_STATICOPENGL', 'Use MESA if true', 'true')),
|
||||
('BF_OPENGL', 'OpenGL base path', ''),
|
||||
('BF_OPENGL_INC', 'OpenGL include path', ''),
|
||||
('BF_OPENGL_LIB', 'OpenGL libraries', ''),
|
||||
|
Loading…
Reference in New Issue
Block a user