diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1701826..2aa66c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,9 @@ on: push jobs: build: runs-on: windows-latest + strategy: + matrix: + platform: [Win32, Win64] steps: - name: Checkout uses: actions/checkout@v3.0.0 @@ -13,29 +16,29 @@ jobs: - name: Configure build uses: ilammy/msvc-dev-cmd@v1 with: - arch: Win32 + arch: ${{matrix.platform}} - name: Build plugin run: | cd tools premake5 vs2022 cd ../build - MsBuild ImGuiRedux.sln /property:Configuration=Release /p:Platform="Win32" /t:ImGuiRedux + MsBuild ImGuiRedux.sln /property:Configuration=Release /p:Platform=${{matrix.platform}} /t:ImGuiRedux - name: Upload plugin uses: actions/upload-artifact@v3 with: - name: ImGuiRedux - path: build\bin\ImGuiRedux.cleo + name: ImGuiRedux${{matrix.platform}} + path: build\bin\ImGuiRedux${{matrix.platform}}.cleo - name: Archive plugin uses: papeloto/action-zip@v1 with: - files: build\bin\ImGuiRedux.cleo - dest: ImGuiRedux.zip + files: build\bin\ImGuiRedux${{matrix.platform}}.cleo + dest: ImGuiRedux${{matrix.platform}}.zip - name: Add build to release tag uses: ncipollo/release-action@v1 with: - artifacts: ImGuiRedux.zip - name: "ImGuiRedux Latest" + artifacts: ImGuiRedux${{matrix.platform}}.zip + name: "ImGuiRedux ${{matrix.platform}}" body: "Secondary tag for [this release](https://github.com/user-grinch/ImGuiRedux/releases/latest) of ImGuiRedux. This release is updated regularly" allowUpdates: true - tag: "x86-latest" + tag: "${{matrix.platform}}-latest" diff --git a/src/pch.h b/src/pch.h index 91dd524..8ba76a0 100644 --- a/src/pch.h +++ b/src/pch.h @@ -1,6 +1,6 @@ #pragma once #define _CRT_SECURE_NO_WARNINGS -#define IMGUI_REDUX_VERSION 1.0f +#define IMGUI_REDUX_VERSION 1.1f #include "cleo_redux_sdk.h" #include "imgui.h" diff --git a/tools/premake5.lua b/tools/premake5.lua index 3539015..0fe92a3 100644 --- a/tools/premake5.lua +++ b/tools/premake5.lua @@ -32,7 +32,7 @@ workspace "ImGuiRedux" project "ImGuiRedux" filter { "platforms:Win32" } - targetname "ImGuiRedux" + targetname "ImGuiReduxWin32" architecture "x86" links { "d3d9", @@ -42,7 +42,7 @@ project "ImGuiRedux" } filter { "platforms:Win64" } - targetname "ImGuiRedux64" + targetname "ImGuiReduxWin64" architecture "x64" links { "d3d9",