From 6e85eec875365b5b6705330030034cb96dfab83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Sat, 16 Mar 2024 21:43:22 -0400
Subject: [PATCH] Fix xpdev and conio builds, disable JS for macOS for now
---
.gitlab-ci.yml | 1 +
src/conio/Common.gmake | 1 +
src/xpdev/Common.gmake | 1 +
3 files changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 403706c8c8..17e50ec2d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,6 +64,7 @@ include:
platform: 'x86'
tagname: 'macOS'
cross_platform: 'yes'
+ no_javascript: 'yes'
smoketest-jsexec-linux:
tags: [Linux]
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 22383686b5..6dcd786fc2 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -103,6 +103,7 @@ ifdef USE_SDL
ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks
+ CFLAGS += -F${SDL_FRAMEWORK_PATH} -framework SDL2
endif
ifdef SDL_FRAMEWORK_PATH
WITH_SDL := 1
diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake
index ca427c3781..a1224c63e8 100644
--- a/src/xpdev/Common.gmake
+++ b/src/xpdev/Common.gmake
@@ -105,6 +105,7 @@ ifdef USE_SDL_AUDIO
ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks
+ CFLAGS += -F${SDL_FRAMEWORK_PATH} -framework SDL2
endif
ifdef SDL_FRAMEWORK_PATH
WITH_SDL_AUDIO := 1
--
GitLab