diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 403706c8c8a870fa01a001cc68bdedd5c341c474..17e50ec2d63657c46659cd74dd6019094b3183a0 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 22383686b55efd8d9b86a870a290b0b8abfe7c09..6dcd786fc2fd5396def45e9e06fe3919c00aee85 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 ca427c37816bbeccd84b1b389b2c73adbe785caf..a1224c63e8ce5f3c6c7d2be47093b1f667a43b3b 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