diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-17 14:19:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-17 14:19:47 +0400 |
| commit | f9795b353e65b3f4ba382dd05621479e7e5a9597 (patch) | |
| tree | 3bde3e0c8225dab222e484a3482969136e352170 /source/blender/windowmanager | |
| parent | f4cff34392a8efe7cc7be448ccd9fa2386597772 (diff) | |
fix for building without the compositor
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 275aeb3317c..c5aaeeb8171 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -143,4 +143,8 @@ if(WIN322) ) endif() +if(WITH_COMPOSITOR) + add_definitions(-DWITH_COMPOSITOR) +endif() + blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index b9170d703aa..2098d872357 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -200,11 +200,13 @@ void WM_init(bContext *C, int argc, const char **argv) BLI_strncpy(G.lib, G.main->name, FILE_MAX); +#ifdef WITH_COMPOSITOR if (1) { extern void *COM_linker_hack; extern void *COM_execute; COM_linker_hack = COM_execute; } +#endif } void WM_init_splash(bContext *C) |