From 39b7bfe6bdc53c08dd5eab7058dfc3d415dfe58c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 21 Nov 2010 13:41:43 +0000 Subject: - check IF WIN32 AND NOT UNIX (for cygwin) - patch from Mike S to enable OpenMP and xcode --- intern/ghost/CMakeLists.txt | 21 ++++++++++++--------- intern/guardedalloc/CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'intern') diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index cd3bbd00b9f..8319772adeb 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -68,16 +68,7 @@ IF(APPLE) IF(WITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) -ELSEIF(WIN32) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") - LIST(APPEND INC ${WINTAB_INC}) - LIST(APPEND SRC - ./intern/GHOST_DisplayManagerWin32.cpp - ./intern/GHOST_SystemWin32.cpp - ./intern/GHOST_WindowWin32.cpp - ./intern/GHOST_DropTargetWin32.cpp - ) ELSEIF(UNIX) LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) @@ -89,6 +80,18 @@ ELSEIF(UNIX) ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}") +ELSEIF(WIN32) + IF(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + LIST(APPEND INC ${WINTAB_INC}) + ENDIF(MSVC) + + LIST(APPEND SRC + ./intern/GHOST_DisplayManagerWin32.cpp + ./intern/GHOST_SystemWin32.cpp + ./intern/GHOST_WindowWin32.cpp + ./intern/GHOST_DropTargetWin32.cpp + ) ENDIF(APPLE) BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}") diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 29e4f553974..10c16e4c98e 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -30,9 +30,9 @@ SET(SRC ./intern/mallocn.c ) -IF(WIN32) +IF(WIN32 AND NOT UNIX) LIST(APPEND SRC ./intern/mmap_win.c) -ENDIF(WIN32) +ENDIF(WIN32 AND NOT UNIX) BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}") -- cgit v1.2.3