diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-08-06 15:21:47 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-08-06 15:21:47 +0400 |
| commit | ad5025ea258b0c7645e7c0da6fe37f0252599f1f (patch) | |
| tree | 4d09afb79870b7365a9c6decb7afb95fd4df84c6 | |
| parent | cf9dcb070931341612369700bc35262d87361c37 (diff) | |
Fix for an link error in makesrna with SCons. Reported by Thomas Dinges, thanks!
Also removed some leftover of the Freestyle trunk merger in the makesrna subdirectory.
| -rw-r--r-- | source/blender/makesrna/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 6 |
3 files changed, 0 insertions, 15 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 3b322491559..2d0c4260c97 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -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') diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index af14e959c11..592c518e9c0 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -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} ) diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 49528db0022..10b6a8c8d10 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -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') |