Skip to content
Snippets Groups Projects
Commit 257124a4 authored by Nathan Letwory's avatar Nathan Letwory
Browse files

- remove Xmu and Xext from linking line for linux2, as they are not needed

+ WITH_BF_OPENAL actually enables or disables use of OpenAL
+ WITH_BF_OPENEXR removes openexr libs from linking if disabled
parent eb185d70
No related branches found
No related tags found
No related merge requests found
...@@ -101,9 +101,9 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' ...@@ -101,9 +101,9 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
WITH_BF_OPENGL = 'true' WITH_BF_OPENGL = 'true'
BF_OPENGL = '/usr/X11R6' BF_OPENGL = '/usr/X11R6'
BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIB = 'GL GLU Xmu Xext X11 Xi' BF_OPENGL_LIB = 'GL GLU X11 Xi'
BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/lib/libGL.a ${BF_OPENGL}/lib/libGLU.a ${BF_OPENGL}/lib/libXmu.a ${BF_OPENGL}/lib/libXext.a ${BF_OPENGL}/lib/libX11.a ${BF_OPENGL}/lib/libXi.a' BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/lib/libGL.a ${BF_OPENGL}/lib/libGLU.a ${BF_OPENGL}/lib/libX11.a ${BF_OPENGL}/lib/libXi.a'
## ##
##CC = gcc ##CC = gcc
##CCC = g++ ##CCC = g++
......
...@@ -137,10 +137,11 @@ def setup_syslibs(lenv): ...@@ -137,10 +137,11 @@ def setup_syslibs(lenv):
lenv['BF_GETTEXT_LIB'] lenv['BF_GETTEXT_LIB']
] ]
if lenv['WITH_BF_OPENAL']: if lenv['WITH_BF_OPENAL']:
lenv['BF_OPENAL_LIB'], syslibs += Split(lenv['BF_OPENAL_LIB'])
if lenv['OURPLATFORM']=='win32vc': if lenv['OURPLATFORM']=='win32vc':
syslibs += Split(lenv['BF_ICONV_LIB']) syslibs += Split(lenv['BF_ICONV_LIB'])
syslibs += Split(lenv['BF_TIFF_LIB']) syslibs += Split(lenv['BF_TIFF_LIB'])
if lenv['WITH_BF_OPENEXR']:
syslibs += Split(lenv['BF_OPENEXR_LIB']) syslibs += Split(lenv['BF_OPENEXR_LIB'])
syslibs += Split(lenv['BF_SDL_LIB']) syslibs += Split(lenv['BF_SDL_LIB'])
syslibs += Split(lenv['BF_OPENGL_LIB']) syslibs += Split(lenv['BF_OPENGL_LIB'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment