From c754a3a86dbd1377eaac67c2c6620864c429e765 Mon Sep 17 00:00:00 2001 From: Akiko Date: Sun, 7 Jun 2015 16:42:54 +0200 Subject: [PATCH] - build system has to use 32bit (the code is not 64bit safe) --- CMakeLists.txt | 5 +++-- GBSPLib/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 GBSPLib/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d92e01..efa50ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,8 @@ MESSAGE ("C-COMPILER: ${CMAKE_C_COMPILER}") MESSAGE ("CXX-COMPILER: ${CMAKE_CXX_COMPILER}") IF (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") MESSAGE ("Unix-like system: ${CMAKE_SYSTEM_NAME}") -SET (CMAKE_CXX_FLAGS "-std=c++1y -fno-builtin -fdiagnostics-color=always -W -Wall -Wextra -Os") -SET (CMAKE_C_FLAGS "-std=c11 -fno-builtin -fdiagnostics-color=always -W -Wall -Wextra -Os") +SET (CMAKE_CXX_FLAGS "-m32 -std=c++1y -fno-builtin -fdiagnostics-color=always -W -Wall -Wextra -Os") +SET (CMAKE_C_FLAGS "-m32 -std=c11 -fno-builtin -fdiagnostics-color=always -W -Wall -Wextra -Os") ELSEIF (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") MESSAGE ("Windows-like system: ${CMAKE_SYSTEM_NAME}") SET (CMAKE_CXX_FLAGS "-std=c++1y -W -Wall -Wextra -Os") @@ -29,3 +29,4 @@ MESSAGE (FATAL_ERROR "unsupported system: ${CMAKE_SYSTEM_NAM ENDIF () ADD_SUBDIRECTORY (G3D) +ADD_SUBDIRECTORY (GBSPLib) diff --git a/GBSPLib/CMakeLists.txt b/GBSPLib/CMakeLists.txt new file mode 100644 index 0000000..f36909c --- /dev/null +++ b/GBSPLib/CMakeLists.txt @@ -0,0 +1 @@ +ADD_LIBRARY (GBSPLib STATIC Brush2.cpp) -- 2.15.1