iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

attempting to fix Windows build once again

Browse Source
This commit is contained in:
CocoSimone
2022-10-29 12:12:03 +02:00
parent 3b86d92f2e
commit c40668e604
6 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/fmt vendored

Submodule external/fmt deleted from 80f8d34427

14
external/imgui/CMakeLists.txt vendored
View File

@@ -1,7 +1,8 @@
cmake_minimum_required(VERSION 3.20)
project(imgui)
find_package(SDL2 REQUIRED)
find_package(Vulkan REQUIRED)
find_package(SDL2 CONFIG REQUIRED)
add_library(imgui
imgui/imgui_demo.cpp
@@ -17,12 +18,11 @@ add_library(imgui
imgui/backends/imgui_impl_vulkan.h
imgui/backends/imgui_impl_vulkan.cpp)
if(WIN32)
target_compile_options(imgui PUBLIC -mwindows)
set(LIBRARIES -static z stdc++ user32 gdi32 winmm Imm32 ole32 oleaut32 shell32 setupapi version uuid)
else()
set(LIBRARIES )
add_compile_definitions(NOMINMAX _CRT_SECURE_NO_WARNINGS)
add_compile_options(/EHa)
endif()
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends)
target_link_libraries(imgui PUBLIC ${SDL2_LIBRARIES} ${LIBRARIES})
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIR} ${Vulkan_INCLUDE_DIRS} imgui imgui/backends)
target_link_libraries(imgui PUBLIC SDL2::SDL2main SDL2::SDL2 Vulkan::Vulkan)

2
external/nativefiledialog-extended vendored

Submodule external/nativefiledialog-extended updated: 31df8e30cc...74923e7c0c

10
external/parallel-rdp/CMakeLists.txt vendored
View File

@@ -52,7 +52,8 @@ add_library(parallel-rdp
target_compile_definitions(parallel-rdp PUBLIC GRANITE_VULKAN_MT)
target_include_directories(parallel-rdp PUBLIC
${SDL2_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR}
${Vulkan_INCLUDE_DIR}
parallel-rdp-standalone/parallel-rdp
parallel-rdp-standalone/volk
parallel-rdp-standalone/spirv-cross
@@ -78,7 +79,12 @@ target_include_directories(parallel-rdp PUBLIC
.
)
target_link_libraries(parallel-rdp SDL2::SDL2main SDL2::SDL2-static)
if(WIN32)
add_compile_definitions(NOMINMAX _CRT_SECURE_NO_WARNINGS)
add_compile_options(/EHa)
endif()
target_link_libraries(parallel-rdp Vulkan::Vulkan SDL2::SDL2main SDL2::SDL2)
if(WIN32)
target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR)