[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23669] branches/soc-2008-mxcurioni/source /blender/windowmanager: Added #include "FRS_freestyle.h" in order to suppress compiler warnings

[Tamito Kajiyama]

Revision: 23669
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23669
Author:   kjym3
Date:     2009-10-06 23:25:56 +0200 (Tue, 06 Oct 2009)

Log Message:
-----------
Added #include "FRS_freestyle.h" in order to suppress compiler warnings
with regard to FRS_initialize().

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c

Modified: 
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt     
2009-10-06 20:00:23 UTC (rev 23668)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt     
2009-10-06 21:25:56 UTC (rev 23669)
@@ -38,6 +38,7 @@
        ../../../intern/ghost ../../../intern/opennl/extern 
../../../extern/glew/include
        ../nodes
        ../gpu
+       ../freestyle
        ../blenfont
        ${OPENGL_INCLUDE_DIR}
 )
@@ -70,6 +71,10 @@
        SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
+IF(WITH_COCOA)
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
+ENDIF(WITH_COCOA)
+
 # TODO buildinfo
 IF(BF_BUILDINFO)
        ADD_DEFINITIONS(-DNAN_BUILDINFO)

Modified: branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript 
2009-10-06 20:00:23 UTC (rev 23668)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript 
2009-10-06 21:25:56 UTC (rev 23669)
@@ -9,7 +9,7 @@
 incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
 incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
 incs += ' ../radiosity/extern/include ../../kernel/gen_system'
-incs += ' ../makesrna ../gpu ../blenfont'
+incs += ' ../makesrna ../gpu ../freestyle ../blenfont'
 
 incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost'
 incs += ' #/intern/elbeem #/extern/glew/include'

Modified: 
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c  
2009-10-06 20:00:23 UTC (rev 23668)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c  
2009-10-06 21:25:56 UTC (rev 23669)
@@ -89,6 +89,8 @@
 
 #include "GPU_draw.h"
 
+#include "FRS_freestyle.h"
+
 // XXX #include "BPY_extern.h"
 
 #include "WM_api.h"


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs