diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-21 15:36:50 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-21 15:36:50 +0300 |
| commit | 11fd198a702d11e79dbc74307e3f5ba6a12c1159 (patch) | |
| tree | 1898cfc1204a1d3db5ba9a50c21edfb3e389b9e2 /config | |
| parent | a2a2ad98e2774930347ffd09a691c1e6d4802ce0 (diff) | |
==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.
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 2 | ||||
| -rw-r--r-- | config/linux2-config.py | 7 | ||||
| -rw-r--r-- | config/linuxcross-config.py | 2 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 2 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 307d4d68aaa..5274de7af23 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -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' diff --git a/config/linux2-config.py b/config/linux2-config.py index b2ee99ae894..f44cda3eee9 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -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++ diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 560c0594659..28d80f8d4b3 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -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' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index cedb7c36aad..a1651ef9643 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -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' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index ea7021e9dc1..4ed9cfe8d17 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -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' |