MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make 32-bit Linux builds also check for undefined symbols.

develop
Ben Lubar 2018-05-10 11:20:19 -05:00
parent 1bb90f6436
commit 58636f5a27
No known key found for this signature in database
GPG Key ID: 018BAB45DB2D2B24
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Plugins.cmake
Unescape Escape View File

@ -6,15 +6,15 @@ IF(UNIX)
IF(DFHACK_BUILD_64) IF(DFHACK_BUILD_64)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-avx") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-avx")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-avx") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-avx")
IF(NOT APPLE)
# Linux: Check for unresolved symbols at link time
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,defs")
ENDIF()
ELSE() ELSE()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
ENDIF() ENDIF()
IF(NOT APPLE)
# Linux: Check for unresolved symbols at link time
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,defs")
ENDIF()
ENDIF() ENDIF()
include_directories("${dfhack_SOURCE_DIR}/library/include") include_directories("${dfhack_SOURCE_DIR}/library/include")

2
plugins/stonesense

@ -1 +1 @@
Subproject commit 6d38bf884eef435d99df5c4e27b3b36ac6f2ec04 Subproject commit b5c02d8a979c6ff44640dbc76ae9bb8a4eb58708