fix build under msys2

This commit is contained in:
oxmox 2023-02-12 17:39:26 +01:00
parent 09d2bd715b
commit c583573b0b
2 changed files with 10 additions and 2 deletions

View file

@ -3,7 +3,9 @@ set(DP_WARN_FLAGS -Wall -Wextra -Wpedantic)
# Source: log.c by rxi (https://github.com/rxi/log.c) # Source: log.c by rxi (https://github.com/rxi/log.c)
add_library(logc log.c) add_library(logc log.c)
target_compile_features(logc PRIVATE c_std_11) target_compile_features(logc PRIVATE c_std_11)
if (NOT WIN32)
target_compile_definitions(logc PRIVATE -DLOG_USE_COLOR) target_compile_definitions(logc PRIVATE -DLOG_USE_COLOR)
endif()
target_compile_options(logc INTERFACE -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. PRIVATE ${DP_WARN_FLAGS}) target_compile_options(logc INTERFACE -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. PRIVATE ${DP_WARN_FLAGS})
find_package(Threads) find_package(Threads)
@ -31,6 +33,12 @@ target_link_libraries(dp_imgui_demo
PRIVATE imgui PRIVATE imgui
) )
if (WIN32)
find_package(SDL2)
target_link_libraries(doompanning PRIVATE SDL2::SDL2main)
target_link_libraries(dp_imgui_demo PRIVATE SDL2::SDL2main)
endif()
add_executable(dp_common_c_test dp_common_c_test.c) add_executable(dp_common_c_test dp_common_c_test.c)
target_compile_features(dp_common_c_test PRIVATE c_std_11) target_compile_features(dp_common_c_test PRIVATE c_std_11)
target_link_libraries(dp_common_c_test target_link_libraries(dp_common_c_test

View file

@ -2,7 +2,7 @@
#include <imgui.h> #include <imgui.h>
#include <backends/imgui_impl_sdl.h> #include <backends/imgui_impl_sdl.h>
#include <backends/imgui_impl_sdlrenderer.h> #include <backends/imgui_impl_sdlrenderer.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <cstdlib> #include <cstdlib>
#include <type_traits> #include <type_traits>