diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae5e9d8b..b776bc64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,11 @@ jobs: sudo apt-get update -qq sudo apt-get install -y build-essential libgtk-3-dev libsdl2-dev git ninja-build nlohmann-json3-dev sudo apt-get install -y vulkan-tools libvulkan1 libvulkan-dev vulkan-validationlayers-dev spirv-tools + git clone --recursive https://github.com/fmtlib/fmt + cd fmt + cmake -B build + cd build + sudo make install - name: Build natsukashii run: | cmake \ @@ -28,7 +33,7 @@ jobs: mkdir upload cp -r build/{natsukashii,resources} upload - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@master with: name: natsukashii-linux path: upload @@ -44,17 +49,20 @@ jobs: vcpkg install sdl2[vulkan]:x64-windows vcpkg install fmt:x64-windows vcpkg install nlohmann-json:x64-windows - vcpkg install vulkan:x64-windows - name: Build natsukashii run: | cmake -B build -T clangcl -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_MIPS_SUPPORT=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S src - cmake --build . --config Release + cmake --build build --config Release - name: Collect artifacts run: | mkdir upload - cp -r build/{natsukashii.exe,resources,SDL2.dll,fmt.dll} upload + cp build/Release/natsukashii.exe upload + mkdir upload/resources + cp build/resources/* upload/resources + cp build/Release/SDL2.dll upload + cp build/Release/fmt.dll upload - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@master with: name: natsukashii-windows path: upload diff --git a/external/imgui/CMakeLists.txt b/external/imgui/CMakeLists.txt index abce5b10..258774d8 100644 --- a/external/imgui/CMakeLists.txt +++ b/external/imgui/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.20) project(imgui) -find_package(Vulkan REQUIRED) find_package(SDL2 CONFIG REQUIRED) add_library(imgui @@ -24,5 +23,5 @@ if(WIN32) add_compile_options(/EHa) endif() -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) \ No newline at end of file +target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIR} ../parallel-rdp/parallel-rdp-standalone/vulkan-headers/include imgui imgui/backends) +target_link_libraries(imgui PUBLIC SDL2::SDL2main SDL2::SDL2) \ No newline at end of file diff --git a/external/parallel-rdp/CMakeLists.txt b/external/parallel-rdp/CMakeLists.txt index bdf61682..c2ed2aee 100644 --- a/external/parallel-rdp/CMakeLists.txt +++ b/external/parallel-rdp/CMakeLists.txt @@ -4,7 +4,6 @@ project(parallel-rdp) file(GLOB_RECURSE parallel-rdp-cpp parallel-rdp-standalone/parallel-rdp/*.cpp) find_package(SDL2 CONFIG REQUIRED) -find_package(Vulkan REQUIRED) add_library(parallel-rdp ${parallel-rdp-cpp} @@ -84,7 +83,7 @@ if(WIN32) add_compile_options(/EHa) endif() -target_link_libraries(parallel-rdp Vulkan::Vulkan SDL2::SDL2main SDL2::SDL2) +target_link_libraries(parallel-rdp SDL2::SDL2main SDL2::SDL2) if(WIN32) target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR)