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

Avoid clearing CMAKE_CXX_FLAGS for plugins

develop
lethosor 2018-07-19 15:32:08 -04:00
parent af53fe6740
commit 09ec8910ca
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Internals ## Internals
- Core: various thread safety and memory management improvements - Core: various thread safety and memory management improvements
- Fixed cmake build dependencies for generated header files - Fixed cmake build dependencies for generated header files
- Fixed custom CMAKE_CXX_FLAGS not being passed to plugins
## Lua ## Lua
- ``utils``: new ``OrderedTable`` class - ``utils``: new ``OrderedTable`` class

11
plugins/Plugins.cmake
Unescape Escape View File

@ -1,15 +1,4 @@
IF(UNIX) IF(UNIX)
add_definitions(-DLINUX_BUILD)
SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall")
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden")
SET(CMAKE_C_FLAGS "-fvisibility=hidden")
IF(DFHACK_BUILD_64)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-avx")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-avx")
ELSE()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
ENDIF()
IF(NOT APPLE) IF(NOT APPLE)
# Linux: Check for unresolved symbols at link time # Linux: Check for unresolved symbols at link time
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs")