diff --git a/docs/changelog.txt b/docs/changelog.txt index 27ee805f2..26c5b0f82 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Internals - Core: various thread safety and memory management improvements - Fixed cmake build dependencies for generated header files +- Fixed custom CMAKE_CXX_FLAGS not being passed to plugins ## Lua - ``utils``: new ``OrderedTable`` class diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake index 1a1dfd4f6..4468140f7 100644 --- a/plugins/Plugins.cmake +++ b/plugins/Plugins.cmake @@ -1,15 +1,4 @@ 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) # Linux: Check for unresolved symbols at link time SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs")