From 07b3dfef02faf60b87e7b5521582b2126058072c Mon Sep 17 00:00:00 2001 From: TheLastVoyager Date: Sun, 3 Nov 2024 15:06:25 +0800 Subject: [PATCH 1/3] Update RGFW_vulkan.h to solve compilation error. VulkWin does not have member window, this issue is present under the Windows and MacOS. --- examples/vk10/RGFW_vulkan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/vk10/RGFW_vulkan.h b/examples/vk10/RGFW_vulkan.h index 3cafd1f..016b790 100644 --- a/examples/vk10/RGFW_vulkan.h +++ b/examples/vk10/RGFW_vulkan.h @@ -130,12 +130,12 @@ void RGFW_createSurface(VkInstance instance, RGFW_window* win, RGFW_window_vulka vkCreateXlibSurfaceKHR(RGFW_vulkan_info.instance, &x11, NULL, &vulkWin->rSurf); #endif #ifdef RGFW_WINDOWS - VkWin32SurfaceCreateInfoKHR win32 = { VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR, 0, 0, GetModuleHandle(NULL), vulkWin->window }; + VkWin32SurfaceCreateInfoKHR win32 = { VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR, 0, 0, GetModuleHandle(NULL), (HWND)win->src.window }; vkCreateWin32SurfaceKHR(RGFW_vulkan_info.instance, &win32, NULL, &vulkWin->rSurf); #endif #if defined(RGFW_MACOS) && !defined(RGFW_MACOS_X11) - VkMacOSSurfaceCreateFlagsMVK macos = { VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK, 0, 0, vulkWin->display, vulkWin->window }; + VkMacOSSurfaceCreateFlagsMVK macos = { VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK, 0, 0, vulkWin->display, (void *)win->src.window }; vkCreateMacOSSurfaceMVK(RGFW_vulkan_info.instance, &macos, NULL, &vulkWin->rSurf); #endif @@ -483,4 +483,4 @@ VkShaderModule RGFW_createShaderModule(const u32* code, size_t code_size) { return shaderModule; } -#endif \ No newline at end of file +#endif From 75481560dbec79b674d5f21d23ec9f536956021c Mon Sep 17 00:00:00 2001 From: TheLastVoyager Date: Sun, 3 Nov 2024 18:27:13 +0800 Subject: [PATCH 2/3] Create c-cpp.yml for github workflow --- .github/workflows/c-cpp.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/c-cpp.yml diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml new file mode 100644 index 0000000..1d1967b --- /dev/null +++ b/.github/workflows/c-cpp.yml @@ -0,0 +1,23 @@ +name: C/C++ CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: actions/checkout@v4 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: make distcheck + run: make distcheck From d7dd4dbc079a9c09edb8aea050a4d5a8e59a8cb9 Mon Sep 17 00:00:00 2001 From: TheLastVoyager Date: Sun, 3 Nov 2024 18:29:25 +0800 Subject: [PATCH 3/3] Delete .github/workflows/c-cpp.yml --- .github/workflows/c-cpp.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/workflows/c-cpp.yml diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml deleted file mode 100644 index 1d1967b..0000000 --- a/.github/workflows/c-cpp.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: C/C++ CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: actions/checkout@v4 - - name: configure - run: ./configure - - name: make - run: make - - name: make check - run: make check - - name: make distcheck - run: make distcheck