From: j-p Date: Tue, 25 Jan 2022 11:08:22 +0000 (+0100) Subject: Worflow test (#68) X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=f0fea45572c1bfbf52d8970fb4d9361c75f2336f;p=jp%2Fvkvg.git Worflow test (#68) * Create cmake.yml, win32 isnanf debug --- diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 0000000..3bcda67 --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,99 @@ +name: CMake + +on: + push: + branches: [ '*' ] + pull_request: + branches: [ master ] + workflow_dispatch: + +jobs: + Win_jorb: + runs-on: windows-latest + strategy: + matrix: + build_config: ['Debug', 'Release'] + arch: ['x64', 'Win32'] + defaults: + run: + shell: cmd + env: + VULKAN_SDK: ${{ github.workspace }}\VulkanSDK + + steps: + - uses: actions/checkout@v2 + - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1 + - uses: actions/checkout@v2 + with: + repository: 'krOoze/vk_sdk_lite' + path: ${{ env.VULKAN_SDK }} + ref: windows + persist-credentials: false + - uses: actions/checkout@v2 + with: + path: 'source' + persist-credentials: false + - run: md source\build + - run: cmake -G "Visual Studio 16 2019" -A ${{ matrix.arch }} .. -DVKVG_RECORDING=false -DCMAKE_SYSTEM_VERSION=10.0.18362.0 -DVKVG_SVG=false -DGIT_SUBMODULE=true + working-directory: source\build + - run: cmake --build . --config ${{ matrix.build_config }} + working-directory: source\build + + linux_jorb: + runs-on: ubuntu-latest + strategy: + matrix: + build_config: ['Debug', 'Release'] + defaults: + run: + shell: bash + env: + VULKAN_SDK: ${{ github.workspace }}/VulkanSDK/x86_64 + + steps: + - uses: actions/checkout@v2 + with: + repository: 'krOoze/vk_sdk_lite' + path: 'VulkanSDK' + ref: linux + persist-credentials: false + - run: echo "${{ env.VULKAN_SDK }}/bin" >> $GITHUB_PATH + - run: sudo apt update && sudo apt install xorg-dev + - uses: actions/checkout@v2 + with: + path: 'source' + persist-credentials: false + - run: mkdir -p source/build + - run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_config }} -G "Unix Makefiles" .. -DVKVG_RECORDING=false -DVKVG_SVG=false -DGIT_SUBMODULE=true + working-directory: source/build + - run: cmake --build . --config ${{ matrix.build_config }} + working-directory: source/build + + mac_jorb: + runs-on: macos-latest + strategy: + matrix: + build_config: ['Debug', 'Release'] + defaults: + run: + shell: bash + env: + VULKAN_SDK: ${{ github.workspace }}/VulkanSDK/macOS + + steps: + - uses: actions/checkout@v2 + with: + repository: 'krOoze/vk_sdk_lite' + path: 'VulkanSDK' + ref: macos + persist-credentials: false + - run: echo "${{ env.VULKAN_SDK }}/bin" >> $GITHUB_PATH + - uses: actions/checkout@v2 + with: + path: 'source' + persist-credentials: false + - run: mkdir -p source/build + - run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_config }} .. -DVKVG_RECORDING=false -DVKVG_SVG=false -DGIT_SUBMODULE=true + working-directory: source/build + - run: cmake --build . --config ${{ matrix.build_config }} + working-directory: source/build diff --git a/README.md b/README.md index c0810d1..82116e2 100644 --- a/README.md +++ b/README.md @@ -8,26 +8,29 @@ Vulkan Vector Graphics

+ + + - + - + - + - +

- + - +

diff --git a/src/cross_os.h b/src/cross_os.h index 1a4386c..cc0cae0 100644 --- a/src/cross_os.h +++ b/src/cross_os.h @@ -27,7 +27,13 @@ //disable warning on iostream functions on windows #define _CRT_SECURE_NO_WARNINGS #include "windows.h" - #define isnanf _isnanf + #if defined(_WIN32) + #define isnanf isnan + #else + #ifndef isnanf + #define isnanf _isnanf + #endif + #endif #define vkvg_inline __forceinline #define disable_warning (warn) #define reset_warning (warn)