sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for an link error in makesrna with SCons. Reported by Thomas Dinges, thanks!

Browse Source 
Also removed some leftover of the Freestyle trunk merger in the makesrna subdirectory.
This commit is contained in:
Tamito Kajiyama 2013-08-06 11:21:47 +00:00
parent cf9dcb0709
commit ad5025ea25
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/SConscript
View File

@ -130,10 +130,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
if env['WITH_BF_FREESTYLE']:
incs += ' ../freestyle'
defs.append('WITH_FREESTYLE')
rnalib = env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
Return ('rnalib')

5
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -280,11 +280,6 @@ blender_include_dirs(
../../../../intern/smoke/extern
)
if(WITH_FREESTYLE)
# TO BE REMOVED when the trunk merger is done
add_definitions(-DWITH_FREESTYLE)
endif()
blender_include_dirs_sys(
${GLEW_INCLUDE_PATH}
)

6
source/blender/makesrna/intern/SConscript
View File

@ -38,8 +38,6 @@ root_build_dir=normpath(env['BF_BUILDDIR'])
source_files = env.Glob('*.c')
source_files.remove('rna_access.c')
if not env['WITH_BF_FREESTYLE']:
source_files.remove('rna_linestyle.c')
generated_files = source_files[:]
generated_files.remove('rna_define.c')
@ -149,10 +147,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
if env['WITH_BF_FREESTYLE']:
# TO BE REMOVED when the trunk merger is done
defs.append('WITH_FREESTYLE')
if not env['BF_DEBUG']:
defs.append('NDEBUG')