diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 16:41:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 16:41:43 +0300 |
| commit | 39b7bfe6bdc53c08dd5eab7058dfc3d415dfe58c (patch) | |
| tree | a476f61efd8381903897eb52d7898418d477a6b3 /source/blender | |
| parent | 722376ed7baf73e3ab6727047130f19873113429 (diff) | |
- check IF WIN32 AND NOT UNIX (for cygwin)
- patch from Mike S to enable OpenMP and xcode
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index f6afa31a28d..131ff861a5c 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -47,9 +47,9 @@ IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DINTERNATIONAL) ENDIF(WITH_INTERNATIONAL) -IF(WIN32) - ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL) -ENDIF(WIN32) +IF(WIN32 AND NOT UNIX) + ADD_DEFINITIONS(-DUSE_GETTEXT_DLL) +ENDIF(WIN32 AND NOT UNIX) BLENDERLIB(bf_blenfont "${SRC}" "${INC}") diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index d42289e17c4..61a6778c13f 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -33,9 +33,9 @@ SET(SRC ../../../../intern/guardedalloc/intern/mallocn.c ) -IF(WIN32) +IF(WIN32 AND NOT UNIX) LIST(APPEND SRC ../../../../intern/guardedalloc/intern/mmap_win.c) -ENDIF(WIN32) +ENDIF(WIN32 AND NOT UNIX) ADD_EXECUTABLE(makesdna ${SRC} ${INC_FILES}) |