From 39c77436737b577ce87ecc4f346622726dc73388 Mon Sep 17 00:00:00 2001 From: David Korth Date: Sat, 24 Sep 2022 20:02:19 -0400 Subject: [PATCH] src/CMakeLists.txt: Need to set RP_LIBROMDATA_IS_DLL in the current *and* parent scope. Otherwise, it shows up properly in the build summary, but libromdata always ends up being built as a static library. --- debian/changelog | 9 +++++++++ src/CMakeLists.txt | 1 + 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index f4b07cfea..d6310b340 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +rom-properties (2.0-1ppa1~xenial6) xenial; urgency=medium + + * Need to set RP_LIBROMDATA_IS_DLL in the current *and* parent scope. + + Otherwise, it shows up properly in the build summary, but libromdata + always ends up being built as a static library. + + -- David Korth Sat, 24 Sep 2022 20:02:02 -0400 + rom-properties (2.0-1ppa1~xenial5) xenial; urgency=medium * Re-add #include "dll-macros.h" to KeyStoreUI.hpp and RomFields.hpp. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 61a90ed2f..8a25aa01f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,6 +98,7 @@ IF(CMAKE_C_COMPILER MATCHES afl) # afl-fuzz crashes when trying to load libromdata.so for some reason. MESSAGE(WARNING "Disabling libromdata.so due to afl") ELSEIF(WIN32 OR (UNIX AND NOT APPLE)) + SET(RP_LIBROMDATA_IS_DLL 1) SET(RP_LIBROMDATA_IS_DLL 1 PARENT_SCOPE) ADD_DEFINITIONS(-DRP_LIBROMDATA_IS_DLL=1) ELSE()