diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-10-21 07:07:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-21 07:07:22 +0300 |
| commit | 95fddf145242003e536bcee46c6022eb6383871c (patch) | |
| tree | 7721ebe1196d600b41dbe79f70937c47e4cf2155 /intern | |
| parent | 7fa8c41693ceb33328bda07bda4489c2dbf8f093 (diff) | |
| parent | 41ec25d27bac8c03e8d5e6ebd97c032137d1010e (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 40 | ||||
| -rw-r--r-- | intern/quadriflow/CMakeLists.txt | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index a5a41209603..f97397715bf 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -126,27 +126,27 @@ add_library(glewmx_lib ${SRC_NEW}) # grr, blenfont needs BLI include_directories( - "../../../source/blender/blenlib" - ) + "../../../source/blender/blenlib" +) add_library(bli_lib - "../../../source/blender/blenlib/intern/fileops.c" - "../../../source/blender/blenlib/intern/gsqueue.c" - "../../../source/blender/blenlib/intern/rct.c" - "../../../source/blender/blenlib/intern/string.c" - "../../../source/blender/blenlib/intern/string_utf8.c" - "../../../source/blender/blenlib/intern/listbase.c" - "../../../source/blender/blenlib/intern/math_color.c" - "../../../source/blender/blenlib/intern/storage.c" - "../../../source/blender/blenlib/intern/task.c" - "../../../source/blender/blenlib/intern/threads.c" - "../../../source/blender/blenlib/intern/time.c" - "../../../source/blender/blenlib/intern/path_util.c" - "../../../source/blender/blenlib/intern/BLI_dynstr.c" - "../../../source/blender/blenlib/intern/BLI_linklist.c" - "../../../source/blender/blenlib/intern/BLI_memarena.c" - "../../../source/blender/blenlib/intern/BLI_mempool.c" - "../../../source/blender/blenlib/intern/system.c" - ) + "../../../source/blender/blenlib/intern/fileops.c" + "../../../source/blender/blenlib/intern/gsqueue.c" + "../../../source/blender/blenlib/intern/rct.c" + "../../../source/blender/blenlib/intern/string.c" + "../../../source/blender/blenlib/intern/string_utf8.c" + "../../../source/blender/blenlib/intern/listbase.c" + "../../../source/blender/blenlib/intern/math_color.c" + "../../../source/blender/blenlib/intern/storage.c" + "../../../source/blender/blenlib/intern/task.c" + "../../../source/blender/blenlib/intern/threads.c" + "../../../source/blender/blenlib/intern/time.c" + "../../../source/blender/blenlib/intern/path_util.c" + "../../../source/blender/blenlib/intern/BLI_dynstr.c" + "../../../source/blender/blenlib/intern/BLI_linklist.c" + "../../../source/blender/blenlib/intern/BLI_memarena.c" + "../../../source/blender/blenlib/intern/BLI_mempool.c" + "../../../source/blender/blenlib/intern/system.c" +) set(PLATFORM_CGLAGS) diff --git a/intern/quadriflow/CMakeLists.txt b/intern/quadriflow/CMakeLists.txt index 615d5a34ce6..35cfe22a018 100644 --- a/intern/quadriflow/CMakeLists.txt +++ b/intern/quadriflow/CMakeLists.txt @@ -38,7 +38,7 @@ set(LIB extern_quadriflow ) -if (WIN32) +if(WIN32) add_definitions(-D_USE_MATH_DEFINES) endif() |