Fiddle with windows linking
This commit is contained in:
parent
3ae3fc4a0c
commit
aaeabb30da
|
@ -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"
|
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
|
ctest -V
|
||||||
mingw32-make package
|
mingw32-make package
|
||||||
|
|
||||||
|
|
|
@ -58,8 +58,8 @@ IF ( GCC OR CLANG )
|
||||||
ENDIF ( GCC OR CLANG )
|
ENDIF ( GCC OR CLANG )
|
||||||
|
|
||||||
if (NOT PHYSFS_FOUND OR WIN32)
|
if (NOT PHYSFS_FOUND OR WIN32)
|
||||||
set(PHYSFS_BUILD_SHARED TRUE)
|
|
||||||
set(PHYSFS_BUILD_STATIC TRUE)
|
set(PHYSFS_BUILD_STATIC TRUE)
|
||||||
|
set(PHYSFS_BUILD_SHARED FALSE)
|
||||||
set(PHYSFS_BUILD_TEST FALSE)
|
set(PHYSFS_BUILD_TEST FALSE)
|
||||||
add_subdirectory(physfs-3.0.1)
|
add_subdirectory(physfs-3.0.1)
|
||||||
include_directories(
|
include_directories(
|
||||||
|
@ -162,13 +162,13 @@ target_link_libraries(breakhack
|
||||||
|
|
||||||
if (NOT PHYSFS_FOUND)
|
if (NOT PHYSFS_FOUND)
|
||||||
target_link_libraries(breakhack
|
target_link_libraries(breakhack
|
||||||
physfs
|
physfs-static
|
||||||
)
|
)
|
||||||
else (NOT PHYSFS_FOUND)
|
else ()
|
||||||
target_link_libraries(breakhack
|
target_link_libraries(breakhack
|
||||||
${PHYSFS_LIBRARY}
|
${PHYSFS_LIBRARY}
|
||||||
)
|
)
|
||||||
endif (NOT PHYSFS_FOUND)
|
endif ()
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
set_target_properties(breakhack PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
|
set_target_properties(breakhack PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
|
||||||
|
|
Loading…
Reference in New Issue