diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-10-07 01:25:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-10-07 01:25:56 +0400 |
| commit | 6d67e48f2aaf7d7a6b5ec17def7250fea321cc22 (patch) | |
| tree | 7c8d9f292356ba496d244be74342d8ee8670c9c5 /source/blender | |
| parent | 3d65a8f0fa6b942de26a028b4ef6f2b21b72987f (diff) | |
Added #include "FRS_freestyle.h" in order to suppress compiler warnings
with regard to FRS_initialize().
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index cb2fc92a1b6..b4f360f68bb 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -38,6 +38,7 @@ SET(INC . ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../nodes ../gpu + ../freestyle ../blenfont ${OPENGL_INCLUDE_DIR} ) @@ -70,6 +71,10 @@ IF(WIN32) 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) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 08a291871f1..b005530da68 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -9,7 +9,7 @@ sources = env.Glob('intern/*.c') 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' diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index f4ec2ab8b4c..fef29fafad1 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -89,6 +89,8 @@ #include "GPU_draw.h" +#include "FRS_freestyle.h" + // XXX #include "BPY_extern.h" #include "WM_api.h" |