[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58966] trunk/blender/source/blender/ makesrna: Fix for an link error in makesrna with SCons.

[Tamito Kajiyama]

Revision: 58966
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58966
Author:   kjym3
Date:     2013-08-06 11:21:47 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/SConscript
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/SConscript

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2013-08-06 10:52:43 UTC (rev 58965)
+++ trunk/blender/source/blender/makesrna/SConscript	2013-08-06 11:21:47 UTC (rev 58966)
@@ -130,10 +130,6 @@
 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')

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-08-06 10:52:43 UTC (rev 58965)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-08-06 11:21:47 UTC (rev 58966)
@@ -280,11 +280,6 @@
 	../../../../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}
 )

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2013-08-06 10:52:43 UTC (rev 58965)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2013-08-06 11:21:47 UTC (rev 58966)
@@ -38,8 +38,6 @@
 
 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['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')