summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-12-21 15:21:18 +0100
committerAlexander Harkness <bearbin@gmail.com>2013-12-21 15:21:18 +0100
commit93718f341c4757cb5199e9d5a45ef4aa8e767855 (patch)
treeb7f14f4302fffa343086375db339d4e25d2906b0
parentUpdate README.md (diff)
parentadded FORCE_32 option (diff)
downloadcuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.tar
cuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.tar.gz
cuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.tar.bz2
cuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.tar.lz
cuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.tar.xz
cuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.tar.zst
cuberite-93718f341c4757cb5199e9d5a45ef4aa8e767855.zip
-rw-r--r--.gitignore1
-rw-r--r--CMakeLists.txt16
2 files changed, 16 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c07822b49..79ae3545d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ Makefile
*.a
*.d
+*.so
CMakeCache.txt
CMakeFiles
Makefile
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 707652bef..17eee02bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,21 @@ else()
add_flags("-pthread")
endif()
-
+if(FORCE_32)
+ add_flags(-m32)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -m32")
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -m32")
+ set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -m32")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
+ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -m32")
+ set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -m32")
+ set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_PROFILE} -m32")
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m32")
+ set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} -m32")
+ set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -m32")
+ set(CMAKE_MODULE_LINKER_FLAGS_PROFILE "${CMAKE_MODULE_LINKER_FLAGS_PROFILE} -m32")
+endif()
set(CMAKE_CXX_FLAGS_RELEASE_BAK "${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_C_FLAGS_RELEASE_BAK "${CMAKE_C_FLAGS_RELEASE}")