diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 18:33:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 18:33:50 +0400 |
commit | 141da38088ea2af3f4f34c86b8bd47fb57657d23 (patch) | |
tree | 0ba97c791662ba5c8e1e962e187f3d09d9d06416 | |
parent | cb640d53d9905e12ed34af47bf39b287030fb487 (diff) |
patch [#23359] Addenda: fixes for SCons FreeBSD 7, 8, 9 support
from Jashank Jeremy (jashank)
-rw-r--r-- | build_files/scons/config/freebsd7-config.py | 8 | ||||
-rw-r--r-- | build_files/scons/config/freebsd8-config.py | 8 | ||||
-rw-r--r-- | build_files/scons/config/freebsd9-config.py | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/build_files/scons/config/freebsd7-config.py b/build_files/scons/config/freebsd7-config.py index 7d66a69a2dc..5678b4bda0a 100644 --- a/build_files/scons/config/freebsd7-config.py +++ b/build_files/scons/config/freebsd7-config.py @@ -57,7 +57,6 @@ BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' # BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' - WITH_BF_DDS = True WITH_BF_JPEG = True @@ -87,7 +86,7 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_GAMEENGINE = True +WITH_BF_GAMEENGINE = False WITH_BF_PLAYER = True WITH_BF_BULLET = True @@ -100,7 +99,8 @@ BF_FREETYPE = '/usr/local' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' -WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME +### XXX Find what this actually wants; it doesn't want libquicktime. +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' @@ -195,7 +195,7 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused -LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] +LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++'] ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) diff --git a/build_files/scons/config/freebsd8-config.py b/build_files/scons/config/freebsd8-config.py index c0df29df335..bc09e87d59f 100644 --- a/build_files/scons/config/freebsd8-config.py +++ b/build_files/scons/config/freebsd8-config.py @@ -57,7 +57,6 @@ BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' # BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' - WITH_BF_DDS = True WITH_BF_JPEG = True @@ -87,7 +86,7 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_GAMEENGINE = True +WITH_BF_GAMEENGINE = False WITH_BF_PLAYER = True WITH_BF_BULLET = True @@ -100,7 +99,8 @@ BF_FREETYPE = '/usr/local' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' -WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME +### XXX Find what this actually wants; it doesn't want libquicktime. +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' @@ -195,7 +195,7 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused -LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] +LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++'] ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) diff --git a/build_files/scons/config/freebsd9-config.py b/build_files/scons/config/freebsd9-config.py index c344046d8cc..3fb4ebe7cd6 100644 --- a/build_files/scons/config/freebsd9-config.py +++ b/build_files/scons/config/freebsd9-config.py @@ -57,7 +57,6 @@ BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' # BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' - WITH_BF_DDS = True WITH_BF_JPEG = True @@ -87,7 +86,7 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_GAMEENGINE = True +WITH_BF_GAMEENGINE = False WITH_BF_PLAYER = True WITH_BF_BULLET = True @@ -100,7 +99,8 @@ BF_FREETYPE = '/usr/local' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' -WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME +### XXX Find what this actually wants; it doesn't want libquicktime. +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' @@ -195,7 +195,7 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused -LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] +LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++'] ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) |