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

Apparently -framework is a link flag, not a compile one

parent 50f3281d
Branches
Tags
No related merge requests found
Pipeline #6162 failed
...@@ -436,11 +436,6 @@ else ...@@ -436,11 +436,6 @@ else
endif endif
SHLIBOPTS := -shared SHLIBOPTS := -shared
ifeq ($(os),darwin)
MKSHLIB := libtool -dynamic -framework System -lcc_dynamic
MKSHPPLIB := libtool -dynamic -framework System -lcc_dynamic -lstdc++
SHLIBOPTS :=
else
ifeq ($(os),sunos) ifeq ($(os),sunos)
MKSHLIB := /usr/ccs/bin/ld -G MKSHLIB := /usr/ccs/bin/ld -G
MKSHPPLIB := /usr/ccs/bin/ld -G MKSHPPLIB := /usr/ccs/bin/ld -G
...@@ -449,7 +444,6 @@ else ...@@ -449,7 +444,6 @@ else
MKSHLIB := $(CC) MKSHLIB := $(CC)
MKSHPPLIB := $(CXX) MKSHPPLIB := $(CXX)
endif endif
endif
# Paths # Paths
XPDEV_SRC := $(SRC_ROOT)$(DIRSEP)xpdev XPDEV_SRC := $(SRC_ROOT)$(DIRSEP)xpdev
......
...@@ -103,7 +103,7 @@ ifdef USE_SDL ...@@ -103,7 +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 CFLAGS += -F${SDL_FRAMEWORK_PATH}
endif endif
ifdef SDL_FRAMEWORK_PATH ifdef SDL_FRAMEWORK_PATH
WITH_SDL := 1 WITH_SDL := 1
......
...@@ -105,7 +105,7 @@ ifdef USE_SDL_AUDIO ...@@ -105,7 +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 CFLAGS += -F${SDL_FRAMEWORK_PATH}
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