walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

CI build again

This commit is contained in:
Linus Probert 2018-09-08 23:54:22 +02:00
parent ccf1ec979b
commit c22d7612be
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -97,20 +97,18 @@ if (STEAM)
) )
endif () endif ()
if (NOT FOUND_LUA OR STEAM) if (NOT LUA_FOUND OR STEAM)
add_subdirectory(lua-5.3.5) add_subdirectory(lua-5.3.5)
include_directories(lua-5.3.5/src) include_directories(lua-5.3.5/src)
set(LUA_LIBRARY lua) set(LUA_LIBRARIES lua)
else () set(LUA_INCLUDE_DIR lua-5.3.5/src)
include_directories(${LUA_INCLUDES})
endif () endif ()
if (NOT FOUND_PHYSFS OR STEAM) if (NOT PHYSFS_FOUND OR STEAM)
add_subdirectory(physfs-3.0.1) add_subdirectory(physfs-3.0.1)
include_directories(physfs-3.0.1/src) include_directories(physfs-3.0.1/src)
set(PHYSFS_LIBRARY physfs-static) set(PHYSFS_LIBRARY physfs-static)
else () set(PHYSFS_INCLUDE_DIR physfs-3.0.1/src)
include_directories(${PHYSFS_INCLUDES})
endif () endif ()
include_directories( include_directories(
@ -119,6 +117,8 @@ include_directories(
${SDL2_IMAGE_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR}
${SDL2_TTF_INCLUDE_DIR} ${SDL2_TTF_INCLUDE_DIR}
${SDL2_MIXER_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR}
${PHYSFS_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
sqlite3 sqlite3
) )
@ -224,7 +224,7 @@ target_link_libraries(breakhack
${SDL2_IMAGE_LIBRARY} ${SDL2_IMAGE_LIBRARY}
${SDL2_TTF_LIBRARY} ${SDL2_TTF_LIBRARY}
${SDL2_MIXER_LIBRARY} ${SDL2_MIXER_LIBRARY}
${LUA_LIBRARY} ${LUA_LIBRARIES}
${PHYSFS_LIBRARY} ${PHYSFS_LIBRARY}
) )