Skip to content
Snippets Groups Projects
Commit 6e85eec8 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Fix xpdev and conio builds, disable JS for macOS for now

parent 7f4bd6b5
Branches
Tags
No related merge requests found
Pipeline #6141 failed
...@@ -64,6 +64,7 @@ include: ...@@ -64,6 +64,7 @@ include:
platform: 'x86' platform: 'x86'
tagname: 'macOS' tagname: 'macOS'
cross_platform: 'yes' cross_platform: 'yes'
no_javascript: 'yes'
smoketest-jsexec-linux: smoketest-jsexec-linux:
tags: [Linux] tags: [Linux]
......
...@@ -103,6 +103,7 @@ ifdef USE_SDL ...@@ -103,6 +103,7 @@ ifdef USE_SDL
ifeq ($(os),darwin) ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES) ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks SDL_FRAMEWORK_PATH ?= /Library/Frameworks
CFLAGS += -F${SDL_FRAMEWORK_PATH} -framework SDL2
endif endif
ifdef SDL_FRAMEWORK_PATH ifdef SDL_FRAMEWORK_PATH
WITH_SDL := 1 WITH_SDL := 1
......
...@@ -105,6 +105,7 @@ ifdef USE_SDL_AUDIO ...@@ -105,6 +105,7 @@ ifdef USE_SDL_AUDIO
ifeq ($(os),darwin) ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES) ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks SDL_FRAMEWORK_PATH ?= /Library/Frameworks
CFLAGS += -F${SDL_FRAMEWORK_PATH} -framework SDL2
endif endif
ifdef SDL_FRAMEWORK_PATH ifdef SDL_FRAMEWORK_PATH
WITH_SDL_AUDIO := 1 WITH_SDL_AUDIO := 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment