[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13297] trunk/blender: made BINRELOC disabled by default with scons, only enable for linux

[Campbell Barton]

Revision: 13297
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13297
Author:   campbellbarton
Date:     2008-01-19 19:52:39 +0100 (Sat, 19 Jan 2008)

Log Message:
-----------
made BINRELOC disabled by default with scons, only enable for linux

Modified Paths:
--------------
    trunk/blender/config/linux2-config.py
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/tools/btools.py

Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py	2008-01-19 17:54:05 UTC (rev 13296)
+++ trunk/blender/config/linux2-config.py	2008-01-19 18:52:39 UTC (rev 13297)
@@ -134,6 +134,8 @@
 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++'

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2008-01-19 17:54:05 UTC (rev 13296)
+++ trunk/blender/config/win32-mingw-config.py	2008-01-19 18:52:39 UTC (rev 13297)
@@ -97,8 +97,6 @@
 
 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

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-01-19 17:54:05 UTC (rev 13296)
+++ trunk/blender/tools/btools.py	2008-01-19 18:52:39 UTC (rev 13297)
@@ -301,7 +301,7 @@
         (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()