From aaeabb30da50d4281100bcdb76342bdb546cf787 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Fri, 11 May 2018 22:56:03 +0200 Subject: [PATCH] Fiddle with windows linking --- .appveyor.yml | 2 +- CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ae62452..fbb257d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -85,7 +85,7 @@ build_script: cmake -DCMAKE_PREFIX_PATH="%PREFIX%" -DCMAKE_C_COMPILER=mingw32-gcc.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -G "MinGW Makefiles" - |- - mingw32-make + mingw32-make breakhack ctest -V mingw32-make package diff --git a/CMakeLists.txt b/CMakeLists.txt index 4315175..502ec9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,8 @@ IF ( GCC OR CLANG ) ENDIF ( GCC OR CLANG ) if (NOT PHYSFS_FOUND OR WIN32) - set(PHYSFS_BUILD_SHARED TRUE) set(PHYSFS_BUILD_STATIC TRUE) + set(PHYSFS_BUILD_SHARED FALSE) set(PHYSFS_BUILD_TEST FALSE) add_subdirectory(physfs-3.0.1) include_directories( @@ -162,13 +162,13 @@ target_link_libraries(breakhack if (NOT PHYSFS_FOUND) target_link_libraries(breakhack - physfs + physfs-static ) -else (NOT PHYSFS_FOUND) +else () target_link_libraries(breakhack ${PHYSFS_LIBRARY} ) -endif (NOT PHYSFS_FOUND) +endif () if (MSVC) set_target_properties(breakhack PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")