From 772cbd9de01bdc8e88ee9bb7e94d83c02b48f44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 2 Jan 2025 08:18:36 +0100 Subject: [PATCH] ci: windows fixes, makefile fix --- .github/workflows/extensions.yml | 19 +------------------ extensions/Makefile | 2 ++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml index b40560f6..7f131fea 100644 --- a/.github/workflows/extensions.yml +++ b/.github/workflows/extensions.yml @@ -42,30 +42,13 @@ jobs: Copy-Item sqlite-amalgamation-3470200\sqlite3.h . Copy-Item sqlite-amalgamation-3470200\sqlite3ext.h . - - name: Debug PATH - if: runner.os == 'Windows' - run: | - where gcc - gcc --version - where clang - clang --versino - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - echo $env:PATH - where cl - - name: Debug uname -m if: runner.os != 'Windows' run: uname -m - - name: Build C files (Unix) - if: runner.os != 'Windows' + - name: Build C files run: cd extensions && make - - name: Build C files (Windows) - if: runner.os == 'Windows' - run: | - "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && cd extensions && make - - name: Commit output files run: | cd extensions diff --git a/extensions/Makefile b/extensions/Makefile index 1290cd1e..5d21454d 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -1,5 +1,7 @@ .PHONY: all headers +OUTPUT := + ifeq ($(OS),Windows_NT) OUTPUT = lib/noattach.dll CCFLAGS = -shared