diff --git a/.gitignore b/.gitignore index c0b1aa8..dbc329c 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ install_manifest.txt compile_commands.json CTestTestfile.cmake _deps + +.project diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0822c3e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cmake/sdl2"] + path = cmake/sdl2 + url = https://github.com/sleepyspider1/sdl2-cmake-modules.git diff --git a/CMakeLists.txt b/CMakeLists.txt index fc92792..3c50426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,14 @@ # Written by JackCarterSmith, 2021 # This code is released under the AST license. +set(CMAKE_VERBOSE_MAKEFILE ON) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdl2) cmake_minimum_required(VERSION 3.1) cmake_policy(VERSION 3.1) # define project -project(ast VERSION 1.0.0 DESCRIPTION "Arena Survival Tournament" LANGUAGES C) +project(AST VERSION 1.0.0 DESCRIPTION "Arena Survival Tournament" LANGUAGES C) set(AST_NAME AST-${PROJECT_VERSION}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY) @@ -18,6 +20,8 @@ include(CheckCSourceCompiles) find_package(SDL2 REQUIRED) include_directories(${SDL2_INCLUDE_DIR}) +find_package(SDL2_image REQUIRED) +include_directories(${SDL2_IMAGE_INCLUDE_DIR}) # define src/headers files @@ -26,22 +30,22 @@ FILE(GLOB AST_HRDS src/*.h) SOURCE_GROUP("Source Files" FILES ${AST_SCRS}) SOURCE_GROUP("Header Files" FILES ${AST_HRDS}) -# begin building ast +# begin building AST #set(CMAKE_BUILD_TYPE Debug) #include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -add_executable(ast ${AST_SCRS} ${AST_HRDS}) -#set_property(TARGET ast PROPERTY C_STANDARD 99) -set_target_properties(ast PROPERTIES OUTPUT_NAME ${AST_NAME}) +add_executable(AST ${AST_SCRS} ${AST_HRDS}) +#set_property(TARGET AST PROPERTY C_STANDARD 99) +set_target_properties(AST PROPERTIES OUTPUT_NAME ${AST_NAME}) if(MSVC) # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(ast PROPERTIES PREFIX "lib") - set_target_properties(ast PROPERTIES IMPORT_PREFIX "lib") + set_target_properties(AST PROPERTIES PREFIX "lib") + set_target_properties(AST PROPERTIES IMPORT_PREFIX "lib") endif() -target_link_libraries(ast ${SDL2_LIBRARIES}) +target_link_libraries(AST ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES}) # install executable -install(TARGETS ast +install(TARGETS AST RUNTIME DESTINATION bin ) \ No newline at end of file diff --git a/cmake/sdl2 b/cmake/sdl2 new file mode 160000 index 0000000..92d3901 --- /dev/null +++ b/cmake/sdl2 @@ -0,0 +1 @@ +Subproject commit 92d390139bf6c0dfea7bcf1c7d6c981fa8ab6800