redstrate/libxiv
Archived
1
Fork 0
Code Activity

Fix macOS build

Browse source
This commit is contained in:
Joshua Goins 2022-04-10 18:08:07 -04:00
parent 13454ba688
commit 851ae281e6
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -27,7 +27,11 @@ endif()
# note: unshield does not work on windows per maintainer notice in README, so we might as well not even attempt to look # note: unshield does not work on windows per maintainer notice in README, so we might as well not even attempt to look
# for it. # for it.
if(NOT WIN32) if(NOT WIN32)
set(LIBRARIES unshield ${LIBRARIES}) find_package(PkgConfig REQUIRED)
pkg_check_modules(libunshield REQUIRED libunshield)
set(LIBRARIES ${libunshield_LIBRARIES} ${LIBRARIES})
set(LIB_DIRS ${libunshield_LIBRARY_DIRS})
endif() endif()
find_package(ZLIB QUIET) find_package(ZLIB QUIET)
@ -68,5 +72,5 @@ add_library(libxiv STATIC
src/installextract.cpp src/installextract.cpp
src/patch.cpp) src/patch.cpp)
target_include_directories(libxiv PUBLIC include PRIVATE src) target_include_directories(libxiv PUBLIC include PRIVATE src)
target_link_libraries(libxiv PUBLIC target_link_libraries(libxiv PUBLIC ${LIBRARIES})
${LIBRARIES}) target_link_directories(libxiv PUBLIC ${LIB_DIRS})

1
src/exhparser.cpp
View file

@ -5,6 +5,7 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <string>
EXH readEXH(const std::string_view path) { EXH readEXH(const std::string_view path) {
EXH exh; EXH exh;

1
src/indexparser.cpp
View file

@ -3,6 +3,7 @@
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <stdexcept> #include <stdexcept>
#include <string>
template<class T> template<class T>
void commonParseSqPack(FILE* file, IndexFile<T>& index) { void commonParseSqPack(FILE* file, IndexFile<T>& index) {