From 2a4864cc4e73deb1be7989c139108bafb511d52e Mon Sep 17 00:00:00 2001 From: Arnaud Date: Wed, 15 Oct 2025 08:30:01 +0200 Subject: [PATCH] Reenable mac and try better windows detection --- .github/workflows/ci.yml | 8 ++++---- Makefile | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bd4034..39f702c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,10 @@ jobs: name: linux lib_ext: so - # - os: macos-latest - # lib_ext: so - # name: macos - # cpu: arm64 + - os: macos-latest + lib_ext: so + name: macos + cpu: arm64 - os: windows-latest cpu: amd64 diff --git a/Makefile b/Makefile index 4ede144..82d9427 100644 --- a/Makefile +++ b/Makefile @@ -4,15 +4,17 @@ LIBS_DIR := $(abspath ./libs) UNAME_S := $(shell uname -s) # Flags for CGO to find the headers and the shared library -ifeq ($(UNAME_S),Darwin) - CGO_CFLAGS := -I$(LIBS_DIR) - CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,@executable_path/./libs -else - CGO_CFLAGS := -I$(LIBS_DIR) - CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,$(LIBS_DIR) -endif +# ifeq ($(UNAME_S),Darwin) +# CGO_CFLAGS := -I$(LIBS_DIR) +# CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,@executable_path/./libs +# else +# CGO_CFLAGS := -I$(LIBS_DIR) +# CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,$(LIBS_DIR) +# endif +CGO_CFLAGS := -I$(LIBS_DIR) +CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,$(LIBS_DIR) -ifeq ($(OS),windows) +ifeq ($(OS),Windows_NT) BIN_NAME := example.exe else BIN_NAME := example