dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-21 20:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmake: Remove fugly hack to compile 32bit binaries

Browse source 
This doesn't work on multiarch systems. A proper cmake toolchain file
has to be used instead.
This commit is contained in:
dhewg 2012-07-09 23:03:12 +02:00 committed by Daniel Gibson
parent 28ff955897
commit 105aec84e1
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -28,7 +28,6 @@ option(CORE "Build the core" ON)
option(BASE "Build the base game code" ON) option(BASE "Build the base game code" ON)
option(D3XP "Build the d3xp game code" OFF) option(D3XP "Build the d3xp game code" OFF)
option(DEDICATED "Build the dedicated server" OFF) option(DEDICATED "Build the dedicated server" OFF)
option(X86 "Cross compile for x86 (only applicable on x86_64)" OFF)
option(ONATIVE "Optimize for the host CPU" OFF) option(ONATIVE "Optimize for the host CPU" OFF)
if (NOT CMAKE_SYSTEM_PROCESSOR) if (NOT CMAKE_SYSTEM_PROCESSOR)
@ -47,10 +46,6 @@ elseif (cpu MATCHES "i.86")
set(cpu "x86") set(cpu "x86")
endif() endif()
if (cpu STREQUAL "x86_64" AND X86)
set(cpu "x86")
endif()
if (MSVC AND CMAKE_CL_64) if (MSVC AND CMAKE_CL_64)
set(cpu "amd64") set(cpu "amd64")
endif() endif()
@ -188,11 +183,6 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
set(sys_libs ${sys_libs} "-framework Carbon -framework Cocoa -framework OpenGL -framework IOKit") set(sys_libs ${sys_libs} "-framework Carbon -framework Cocoa -framework OpenGL -framework IOKit")
else() else()
if (cpu STREQUAL "x86" AND X86)
add_definitions(-m32)
set(ldflags "${ldflags} -m32")
endif()
if (os STREQUAL "linux") if (os STREQUAL "linux")
set(sys_libs ${sys_libs} dl) set(sys_libs ${sys_libs} dl)
endif() endif()