-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release][0.0.1] Features/cross gui (#6)
* stall: requires further steps to be compilable with linux, namely fmt * integrated fmt * for testing with linux * updated requirements * fixed and launched for linux * winrt finally supported * fixed message * Update cmake.yml * Update cmake.yml * Update cmake.yml * minimal build, better platform switches * fix vulkan * fixed warning, fixed build
- Loading branch information
Showing
77 changed files
with
2,445 additions
and
550 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,39 @@ env: | |
| BUILD_TYPE: Debug | ||
|
|
||
| jobs: | ||
| build_linux: | ||
| # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. | ||
| # You can convert this to a matrix build if you need cross-platform coverage. | ||
| # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Prepare Vulkan SDK | ||
| uses: humbletim/[email protected] | ||
| with: | ||
| vulkan-query-version: latest | ||
| vulkan-components: Vulkan-Headers, Vulkan-Loader | ||
| vulkan-use-cache: true | ||
|
|
||
| - name: Install KDUtils requirements | ||
| run: sudo apt install libxkbcommon-dev libxcb-xkb-dev libxkbcommon-x11-dev wayland-scanner++ wayland-protocols ninja-build | ||
|
|
||
| - name: Setup cmake | ||
| uses: jwlawson/[email protected] | ||
| with: | ||
| cmake-version: '3.25.x' | ||
|
|
||
| - name: Configure CMake | ||
| # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. | ||
| # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type | ||
| run: cmake -B ${{github.workspace}}/build_dx -GNinja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER:STRING="gcc-12" -DCMAKE_CXX_COMPILER:STRING="g++-12" | ||
|
|
||
| - name: Build WisdomKD | ||
| # Build your program with the given configuration | ||
| run: cmake --build ${{github.workspace}}/build_dx --config ${{env.BUILD_TYPE}} | ||
|
|
||
| build_dx: | ||
| # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. | ||
| # You can convert this to a matrix build if you need cross-platform coverage. | ||
|
|
@@ -57,7 +90,26 @@ jobs: | |
| # Build your program with the given configuration | ||
| run: cmake --build ${{github.workspace}}/build_dx --config ${{env.BUILD_TYPE}} | ||
|
|
||
| build_uwp: | ||
| # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. | ||
| # You can convert this to a matrix build if you need cross-platform coverage. | ||
| # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix | ||
| runs-on: windows-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Visual Studio shell | ||
| uses: egor-tensin/vs-shell@v2 | ||
|
|
||
| - name: Configure CMake | ||
| # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. | ||
| # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type | ||
| run: cmake -B ${{github.workspace}}/build_dx -G"Visual Studio 17" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER:STRING="cl.exe" -DCMAKE_CXX_COMPILER:STRING="cl.exe" -DCMAKE_SYSTEM_NAME:STRING="WindowsStore" -DCMAKE_SYSTEM_VERSION:STRING="10.0" -DCMAKE_BUILD_TYPE:STRING="Debug" | ||
|
|
||
| - name: Build WisdomUWP | ||
| # Build your program with the given configuration | ||
| run: cmake --build ${{github.workspace}}/build_dx --config ${{env.BUILD_TYPE}} | ||
|
|
||
| #- name: Test | ||
| # working-directory: ${{github.workspace}}/build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # Function for installing DirectX SDK | ||
| function(wis_install_dx PROJECT) | ||
| message("Installing DirectX Agility SDK Dependency") | ||
|
|
||
| get_property(DX12SDKVER TARGET DX12Agility PROPERTY DX12SDKVER) | ||
|
|
||
| set(EXPORT_AGILITY "extern \"C\" { _declspec(dllexport) extern const unsigned D3D12SDKVersion = ${DX12SDKVER}; } | ||
| extern \"C\" { _declspec(dllexport) extern const char* D3D12SDKPath = \".\\\\D3D12\\\\\"; }" | ||
| ) | ||
|
|
||
| file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/exports.cpp" "${EXPORT_AGILITY}") | ||
|
|
||
| target_sources(${PROJECT} PRIVATE | ||
| ${CMAKE_CURRENT_BINARY_DIR}/exports.cpp | ||
| ) | ||
|
|
||
| add_custom_command(TARGET ${PROJECT} POST_BUILD | ||
| COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:DX12AgilityCore> $<TARGET_FILE_DIR:${PROJECT}>/D3D12/$<TARGET_FILE_NAME:DX12AgilityCore> | ||
| COMMAND_EXPAND_LISTS | ||
| COMMENT "Copying DX12 Agility Core..." | ||
| ) | ||
|
|
||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| add_custom_command(TARGET ${PROJECT} POST_BUILD | ||
| COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:DX12AgilitySDKLayers> $<TARGET_FILE_DIR:${PROJECT}>/D3D12/$<TARGET_FILE_NAME:DX12AgilitySDKLayers> | ||
| COMMAND_EXPAND_LISTS | ||
| COMMENT "Copying DX12 Agility SDKLayers..." | ||
| ) | ||
| endif() | ||
| endfunction() | ||
|
|
||
| # Function for installing DirectX SDK for UWP | ||
| function(wis_install_dx_uwp PROJECT) | ||
| message("Installing DirectX Agility SDK Dependency") | ||
|
|
||
| get_property(DX12SDKVER TARGET DX12Agility PROPERTY DX12SDKVER) | ||
|
|
||
| set(EXPORT_AGILITY "extern \"C\" { _declspec(dllexport) extern const unsigned D3D12SDKVersion = ${DX12SDKVER}; } | ||
| extern \"C\" { _declspec(dllexport) extern const char* D3D12SDKPath = \".\\\\D3D12\\\\\"; }" | ||
| ) | ||
|
|
||
| file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/exports.cpp" "${EXPORT_AGILITY}") | ||
|
|
||
| target_sources(${PROJECT} PRIVATE | ||
| ${CMAKE_CURRENT_BINARY_DIR}/exports.cpp | ||
| ) | ||
|
|
||
| get_target_property(dxadll DX12AgilityCore IMPORTED_LOCATION) | ||
| message("DX12AgilityCore: ${dxadll}") | ||
| set_property(SOURCE ${dxadll} PROPERTY VS_DEPLOYMENT_CONTENT 1) | ||
| set_property(SOURCE ${dxadll} PROPERTY VS_DEPLOYMENT_LOCATION "D3D12") | ||
| target_sources(${PROJECT} PRIVATE ${dxadll}) | ||
|
|
||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| get_target_property(dxalayersdll DX12AgilitySDKLayers IMPORTED_LOCATION) | ||
| message("DX12AgilitySDKLayers: ${dxalayersdll}") | ||
| set_property(SOURCE ${dxalayersdll} PROPERTY VS_DEPLOYMENT_CONTENT 1) | ||
| set_property(SOURCE ${dxalayersdll} PROPERTY VS_DEPLOYMENT_LOCATION "D3D12") | ||
| target_sources(${PROJECT} PRIVATE ${dxalayersdll}) | ||
| endif() | ||
|
|
||
| endfunction() |
File renamed without changes.
Oops, something went wrong.