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

Statically link on windows, copy resources folder in CI

Browse Source
This commit is contained in:
Simone Coco
2022-09-17 20:16:25 +02:00
parent f4458e2aea
commit 71899ef9fa
6 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
cp build/natsukashii upload cp -r build/{natsukashii,resources} upload
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@@ -50,7 +50,7 @@ jobs:
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
cp build/natsukashii.exe upload cp -r build/{natsukashii.exe,resources} upload
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:

9
external/imgui/CMakeLists.txt vendored
View File

@@ -17,5 +17,12 @@ add_library(imgui
imgui/backends/imgui_impl_vulkan.h imgui/backends/imgui_impl_vulkan.h
imgui/backends/imgui_impl_vulkan.cpp) 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 )
endif()
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends) target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends)
target_link_libraries(imgui PUBLIC SDL2main SDL2) target_link_libraries(imgui PUBLIC SDL2main SDL2 ${LIBRARIES} )

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

@@ -74,7 +74,14 @@ target_include_directories(parallel-rdp PUBLIC
. .
) )
target_link_libraries(parallel-rdp SDL2main SDL2) if(WIN32)
target_compile_options(parallel-rdp PUBLIC -mwindows)
set(LIBRARIES -static z stdc++ user32 gdi32 winmm Imm32 ole32 oleaut32 shell32 setupapi version uuid)
else()
set(LIBRARIES )
endif()
target_link_libraries(parallel-rdp SDL2main SDL2 ${LIBRARIES})
if(WIN32) if(WIN32)
target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR) target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR)

4
src/CMakeLists.txt
View File

@@ -14,7 +14,7 @@ find_package(fmt REQUIRED)
add_executable(natsukashii main.cpp) add_executable(natsukashii main.cpp)
if (CMAKE_BUILD_TYPE MATCHES Debug) if (CMAKE_BUILD_TYPE MATCHES Debug)
set(OPTIMIZATIONS -g set(OPTIMIZATIONS -g -O0
#-fsanitize=address -fsanitize=undefined #-fsanitize=address -fsanitize=undefined
) )
#target_link_libraries(natsukashii PUBLIC -fsanitize=address -fsanitize=undefined) #target_link_libraries(natsukashii PUBLIC -fsanitize=address -fsanitize=undefined)
@@ -24,4 +24,4 @@ endif()
target_link_libraries(natsukashii PUBLIC frontend n64 fmt) target_link_libraries(natsukashii PUBLIC frontend n64 fmt)
target_include_directories(natsukashii PUBLIC . ../external) target_include_directories(natsukashii PUBLIC . ../external)
target_compile_options(natsukashii PUBLIC ${OPTIMIZATIONS} -Wpedantic -Wimplicit-fallthrough -Wextra -Wall) target_compile_options(natsukashii PUBLIC ${OPTIMIZATIONS})

10
src/frontend/imgui/CMakeLists.txt
View File

@@ -26,4 +26,12 @@ target_include_directories(frontend-imgui PUBLIC
../../../external/parallel-rdp/parallel-rdp-standalone/vulkan ../../../external/parallel-rdp/parallel-rdp-standalone/vulkan
../../../external/parallel-rdp/parallel-rdp-standalone/util ../../../external/parallel-rdp/parallel-rdp-standalone/util
../../../external/parallel-rdp/parallel-rdp-standalone/volk) ../../../external/parallel-rdp/parallel-rdp-standalone/volk)
target_link_libraries(frontend-imgui PUBLIC SDL2main SDL2 imgui nfd fmt)
if(WIN32)
target_compile_options(frontend-imgui PUBLIC -mwindows)
set(LIBRARIES -static z stdc++ user32 gdi32 winmm Imm32 ole32 oleaut32 shell32 setupapi version uuid)
else()
set(LIBRARIES )
endif()
target_link_libraries(frontend-imgui PUBLIC SDL2main SDL2 ${LIBRARIES} imgui nfd fmt)

2
src/n64/core/CMakeLists.txt
View File

@@ -53,4 +53,4 @@ target_include_directories(core PUBLIC
../../../external/imgui/imgui/backends ../../../external/imgui/imgui/backends
mmio) mmio)
target_link_libraries(core PUBLIC capstone SDL2main SDL2 fmt cpu parallel-rdp) target_link_libraries(core PUBLIC capstone fmt cpu parallel-rdp)