cca4b6f9f4
to pick up a version number; this used to say "exported" when no .svn dir is present, now it says "unversioned directory", the build infrastructure can't handle the whitespace). it's useless anyway so just blank this out. result is the same as the case where svn isn't installed, so not bothering to bump. problem reported by espie@ naddy@
48 lines
1.6 KiB
Plaintext
48 lines
1.6 KiB
Plaintext
$OpenBSD: patch-tools_Blender_py,v 1.4 2011/10/18 15:58:33 sthen Exp $
|
|
--- tools/Blender.py.orig Tue Sep 1 16:21:54 2009
|
|
+++ tools/Blender.py Tue Oct 18 16:55:51 2011
|
|
@@ -116,6 +116,7 @@ def setup_staticlibs(lenv):
|
|
'/usr/lib',
|
|
lenv['BF_OPENGL_LIBPATH'],
|
|
lenv['BF_JPEG_LIBPATH'],
|
|
+ lenv['BF_GLEW_LIBPATH'],
|
|
lenv['BF_PNG_LIBPATH'],
|
|
lenv['BF_ZLIB_LIBPATH'],
|
|
lenv['BF_ICONV_LIBPATH']
|
|
@@ -156,7 +157,8 @@ def setup_syslibs(lenv):
|
|
|
|
lenv['BF_JPEG_LIB'],
|
|
lenv['BF_PNG_LIB'],
|
|
- lenv['BF_ZLIB_LIB']
|
|
+ lenv['BF_ZLIB_LIB'],
|
|
+ lenv['BF_GLEW_LIB']
|
|
]
|
|
|
|
if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']:
|
|
@@ -217,7 +219,7 @@ def buildinfo(lenv, build_type):
|
|
"""
|
|
build_date = time.strftime ("%Y-%m-%d")
|
|
build_time = time.strftime ("%H:%M:%S")
|
|
- build_rev = os.popen('svnversion').read()[:-1] # remove \n
|
|
+ build_rev = ""
|
|
|
|
obj = []
|
|
if lenv['BF_BUILDINFO']:
|
|
@@ -398,7 +400,7 @@ class BlenderEnvironment(SConsEnvironment):
|
|
|
|
print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
|
|
lenv = self.Clone()
|
|
- res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
|
|
+ res = lenv.RES(root_build_dir+'lib/'+libname, source)
|
|
|
|
SConsEnvironment.Default(self, res)
|
|
resources.append(res)
|
|
@@ -421,6 +423,7 @@ class BlenderEnvironment(SConsEnvironment):
|
|
else:
|
|
print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC
|
|
lenv = self.Clone()
|
|
+ lenv['CCFLAGS'] = Split(lenv['CCFLAGS'])
|
|
lenv.Append(CPPPATH=includes)
|
|
lenv.Append(CPPDEFINES=defines)
|
|
if lenv['BF_DEBUG'] or (libname in quickdebug):
|