dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2025-02-16 17:11:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix semi-colons being inserted into ldflags

Browse source 
It is causing clang++ to error when linking game{cpu}.dylib
This commit is contained in:
scottWakeling 2011-12-23 16:29:05 +00:00 committed by Daniel Gibson
parent 16e2bf160d
commit 0d01f4f90b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -152,25 +152,25 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
if (cpu STREQUAL "x86_64") if (cpu STREQUAL "x86_64")
add_definitions(-arch x86_64 -mmacosx-version-min=10.6) add_definitions(-arch x86_64 -mmacosx-version-min=10.6)
set(ldflags ${ldflags} "-arch x86_64 -mmacosx-version-min=10.6") set(ldflags "${ldflags} -arch x86_64 -mmacosx-version-min=10.6")
elseif (cpu STREQUAL "x86") elseif (cpu STREQUAL "x86")
CHECK_CXX_COMPILER_FLAG("-arch i386" cxx_has_arch_i386) CHECK_CXX_COMPILER_FLAG("-arch i386" cxx_has_arch_i386)
if (cxx_has_arch_i386) if (cxx_has_arch_i386)
add_definitions(-arch i386) add_definitions(-arch i386)
set(ldflags ${ldflags} "-arch i386") set(ldflags "${ldflags} -arch i386")
endif() endif()
add_definitions(-mmacosx-version-min=10.4) add_definitions(-mmacosx-version-min=10.4)
set(ldflags ${ldflags} "-mmacosx-version-min=10.4") set(ldflags "${ldflags} -mmacosx-version-min=10.4")
elseif (cpu STREQUAL "ppc") elseif (cpu STREQUAL "ppc")
CHECK_CXX_COMPILER_FLAG("-arch ppc" cxx_has_arch_ppc) CHECK_CXX_COMPILER_FLAG("-arch ppc" cxx_has_arch_ppc)
if (cxx_has_arch_ppc) if (cxx_has_arch_ppc)
add_definitions(-arch ppc) add_definitions(-arch ppc)
set(ldflags ${ldflags} "-arch ppc") set(ldflags "${ldflags} -arch ppc")
endif() endif()
add_definitions(-mmacosx-version-min=10.4) add_definitions(-mmacosx-version-min=10.4)
set(ldflags ${ldflags} "-mmacosx-version-min=10.4") set(ldflags "${ldflags} -mmacosx-version-min=10.4")
else() else()
message(FATAL_ERROR "Unsupported CPU architecture for OSX") message(FATAL_ERROR "Unsupported CPU architecture for OSX")
endif() endif()
@ -179,7 +179,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
else() else()
if (cpu STREQUAL "x86" AND X86) if (cpu STREQUAL "x86" AND X86)
add_definitions(-m32) add_definitions(-m32)
set(ldflags ${ldflags} "-m32") set(ldflags "${ldflags} -m32")
endif() endif()
if (os STREQUAL "linux") if (os STREQUAL "linux")