diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-01-19 21:52:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-19 21:52:39 +0300 |
commit | 5a4fc7a8fd3778388c92953a8e30aa1415f81122 (patch) | |
tree | 80890657ac15d2d8551514eac5f303de0a21de40 | |
parent | d450dbec9177f2e691fddbefdab20adda18c7ae3 (diff) |
made BINRELOC disabled by default with scons, only enable for linux
-rw-r--r-- | config/linux2-config.py | 2 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 2 | ||||
-rwxr-xr-x | tools/btools.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index abba0f97ef2..5d813c176ea 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -134,6 +134,8 @@ BF_OPENGL_LIB = 'GL GLU X11 Xi' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' 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' +WITH_BF_BINRELOC = 'true' + ## CC = 'gcc' CXX = 'g++' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index b2857ae6ef6..8c8c12db46f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -97,8 +97,6 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' WITH_BF_YAFRAY = 'true' -WITH_BF_BINRELOC = 'false' - #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/tools/btools.py b/tools/btools.py index 913e086a792..b1e5c200794 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -301,7 +301,7 @@ def read_opts(cfg, args): (BoolOption('BF_SPLIT_SRC', 'Split src lib into several chunks if true', 'false')), (BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', 'false')), (BoolOption('BF_FANCY', 'Enable fancy output if true', 'true')), - (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'true')), + (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')), ) # end of opts.AddOptions() |