pool/slade
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

- Update to release 3.1.11

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=22
This commit is contained in:
Jan Engelhardt
2020-04-18 18:36:37 +00:00
committed by Git OBS Bridge
parent afb52dd57c
commit 96e6d724a6
8 changed files with 75 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
wx.diff Normal file
View File

@@ -0,0 +1,35 @@
[ 12s] /usr/include/wx-3.0/wx/filename.h:139: undefined reference to `wxFileName::Assign(wxString const&, wxPathFormat)'
[ 12s] /usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: CMakeFiles/external.dir/email/wxEmailMessage.o: in function `wxEmailMessage::DoAddAttachment(wxString const&, wxString&) const':
---
src/CMakeLists.txt | 2 +-
src/External/CMakeLists.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: SLADE-3.1.11/src/CMakeLists.txt
===================================================================
--- SLADE-3.1.11.orig/src/CMakeLists.txt
+++ SLADE-3.1.11/src/CMakeLists.txt
@@ -52,7 +52,7 @@ if (WX_GTK3)
set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
endif (WX_GTK3)
-SET(WX_LIBS std aui gl stc richtext propgrid media)
+SET(WX_LIBS base std aui gl stc richtext propgrid media)
if (NO_WEBVIEW)
SET(WX_LIBS ${WX_LIBS} html)
else (NO_WEBVIEW)
Index: SLADE-3.1.11/src/External/CMakeLists.txt
===================================================================
--- SLADE-3.1.11.orig/src/External/CMakeLists.txt
+++ SLADE-3.1.11/src/External/CMakeLists.txt
@@ -30,6 +30,6 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
${SLADE_HEADERS}
)
-add_library(external ${EXTERNAL_SOURCES})
-target_link_libraries(external ${ZLIB_LIBRARY})
+add_library(external STATIC ${EXTERNAL_SOURCES})
+target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES})
set(EXTERNAL_LIBRARIES external PARENT_SCOPE)