projects / genesis3d.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 34b4cc8)
- build system has to use 32bit (the code is not 64bit safe)
authorAkiko <akiko@linux-addicted.net>
Sun, 7 Jun 2015 14:42:54 +0000 (16:42 +0200)
committerAkiko <akiko@linux-addicted.net>
Sun, 7 Jun 2015 14:42:54 +0000 (16:42 +0200)
CMakeLists.txt patch | blob | history
GBSPLib/CMakeLists.txt [new file with mode: 0644] patch | blob

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d92e01..efa50ca 100644 (file)
--- 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}")
 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")
 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)
 ENDIF                   ()
 
 ADD_SUBDIRECTORY        (G3D)
+ADD_SUBDIRECTORY        (GBSPLib)
diff --git a/GBSPLib/CMakeLists.txt b/GBSPLib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f36909c
--- /dev/null
+++ b/GBSPLib/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_LIBRARY             (GBSPLib STATIC Brush2.cpp)