Fix for [#28339] Rev:39618 The revision part doesn't suffice.
authorThomas Dinges <blender@dingto.org>
Tue, 23 Aug 2011 08:02:48 +0000 (08:02 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 23 Aug 2011 08:02:48 +0000 (08:02 +0000)
NAN_BUILDINFO > WITH_BUILDINFO change from rev 39618 was missing in those files.

source/blender/collada/SConscript
source/blender/windowmanager/SConscript

index 3dd6160c445da506fb239b0e8ceafc1e5a9bbc09..17cca9e37063ccdc2d2df51362a31361dfc9722d 100644 (file)
@@ -38,6 +38,6 @@ else:
     incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
 
 if env['BF_BUILDINFO']:
-    defs.append('NAN_BUILDINFO')
+    defs.append('WITH_BUILDINFO')
 
 env.BlenderLib ('bf_collada', sources, Split(incs), defs, libtype='core', priority=200 )
index e548d99e9a5493d7ab46bea66e5d6a08599b983b..80c526f8649d436f4764c2a775103b90642531a0 100644 (file)
@@ -37,6 +37,6 @@ if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']:
     sources.remove('intern' + os.sep + 'wm_apple.c')
 
 if env['BF_BUILDINFO']:
-    defs.append('NAN_BUILDINFO')
+    defs.append('WITH_BUILDINFO')
 
 env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )