libretro/stella2014-libretro
1
0
Fork 0
mirror of https://github.com/libretro/stella2014-libretro.git synced 2024-11-26 17:30:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More buildfixes

Browse Source
This commit is contained in:
twinaphex 2021-11-16 10:12:18 +01:00
parent 6c81437f18
commit 9d60a76782
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -95,10 +95,10 @@ ifeq ($(IOSSDK),)
endif
ifeq ($(platform),ios-arm64)
CC = cc -arch arm64 -isysroot $(IOSSDK)
CC = clang -arch arm64 -isysroot $(IOSSDK)
CXX = clang++ -arch arm64 -isysroot $(IOSSDK)
else
CC = cc -arch armv7 -isysroot $(IOSSDK)
CC = clang -arch armv7 -isysroot $(IOSSDK)
CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
endif
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
@ -117,8 +117,8 @@ else ifeq ($(platform), tvos-arm64)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
endif
CC = cc -arch arm64 -isysroot $(IOSSDK)
CCX = c++ -arch arm64 -isysroot $(IOSSDK)
CC = clang -arch arm64 -isysroot $(IOSSDK)
CCX = clang++ -arch arm64 -isysroot $(IOSSDK)
else ifeq ($(platform), theos_ios)
DEPLOYMENT_IOSVERSION = 5.0

14
Makefile.common
View File

@ -1,12 +1,12 @@
LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common
INCFLAGS := -I. \
-I$(CORE_DIR) \
-I$(CORE_DIR)/src \
-I$(CORE_DIR)/stubs \
-I$(CORE_DIR)/src/emucore \
-I$(CORE_DIR)/src/common \
-I$(CORE_DIR)/src/gui \
-I$(LIBRETRO_COMM_DIR)/include
-I$(CORE_DIR) \
-I$(CORE_DIR)/src \
-I$(CORE_DIR)/stubs \
-I$(CORE_DIR)/src/emucore \
-I$(CORE_DIR)/src/common \
-I$(CORE_DIR)/src/gui \
-I$(LIBRETRO_COMM_DIR)/include
ifneq (,$(findstring msvc2003,$(platform)))
INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc

1
jni/Android.mk
View File

@ -16,6 +16,7 @@ endif
include $(CLEAR_VARS)
LOCAL_MODULE := retro
LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
LOCAL_CFLAGS := $(COREFLAGS)
LOCAL_CXXFLAGS := $(COREFLAGS)
LOCAL_LDFLAGS := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
LOCAL_CPP_FEATURES := exceptions