starred/Mu
1
0
Fork 0
mirror of https://github.com/libretro/Mu.git synced 2026-09-23 15:15:43 +00:00
Code Issues 18 Packages Projects Releases 2 Wiki Activity

Got Mac RetroArch build working with ARM emulator

Browse Source 
Hopefully dident break ARM emulator on Windows.
This commit is contained in:
meepingsnesroms
2019-05-13 12:38:42 -07:00
parent d70e2b02b9
commit 125e85d73b
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libretroBuildSystem/build/Makefile.common
View File

@@ -34,10 +34,10 @@ else ifneq (,$(findstring armv,$(platform)))
EMU_SUPPORT_PALM_OS5 = 1
EMU_ARCH := armv7
EMU_OS := linux
else ifneq (,$(filter unix osx linux_x86 linux_x86_64 linux-portable_x86 linux-portable_x86_64,$(platform)))
else ifneq (,$(filter unix osx osx_x86 osx_x86_64 linux_x86 linux_x86_64 linux-portable_x86 linux-portable_x86_64,$(platform)))
# x86_* Linux
EMU_SUPPORT_PALM_OS5 = 1
ifneq (,$(findstring x64,$(platform)))
ifneq (,$(filter osx osx_x86_64 linux_x86_64 linux-portable_x86_64,$(platform)))
EMU_ARCH := x86_64
else
EMU_ARCH := x86_32
@@ -53,6 +53,12 @@ else ifeq ($(platform), osx)
endif
endif
ifeq ($(EMU_SUPPORT_PALM_OS5), 1)
ifneq ($(platform), android_jni)
CXXFLAGS += -std=c++11
endif
endif
include $(EMU_PATH)/makefile.all
COREDEFINES += $(EMU_DEFINES)

2
libretroBuildSystem/jni/Android.mk
View File

@@ -4,6 +4,8 @@ CORE_DIR := $(LOCAL_PATH)/..
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
platform = android_jni
# Palm OS 5 support
EMU_SUPPORT_PALM_OS5 = 1
EMU_OS := linux

1
libretroBuildSystem/jni/Application.mk
View File

@@ -1,2 +1,3 @@
APP_ABI := all
APP_PLATFORM := android-18
APP_CPPFLAGS += -std=c++11