notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix multiline support
[picodrive.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
b2ccc41
..
4d34134
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-73,44
+73,35
@@
else ifeq ($(platform), osx)
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
SHARED += -mmacosx-version-min=10.1
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
SHARED += -mmacosx-version-min=10.1
-# iOS
-else ifneq (,$(findstring ios,$(platform)))
- TARGET := $(TARGET_NAME)_libretro_ios.dylib
- SHARED := -dynamiclib
- fpic := -fPIC
+else ifeq ($(platform), staticios)
+ TARGET := $(TARGET_NAME)_libretro_ios.a
APPLE := 1
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
APPLE := 1
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
- CC = clang -arch armv7 -isysroot $(IOSSDK)
- CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+ CC = clang -arch armv7 -
arch arm64 -
isysroot $(IOSSDK)
+ CXX = clang++ -arch armv7 -
arch arm64 -
isysroot $(IOSSDK)
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
- CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
- ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+ CFLAGS += -marm
CFLAGS += -DIOS
CFLAGS += -DIOS
-ifeq ($(platform),ios9)
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
-else
- CC += -miphoneos-version-min=5.0
- CXX += -miphoneos-version-min=5.0
- CC_AS += -miphoneos-version-min=5.0
- CFLAGS += -miphoneos-version-min=5.0
-endif
ARCH := arm
ARCH := arm
+ STATIC_LINKING = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
- use_sh2drc =
1
- use_svpdrc =
1
+ use_sh2drc =
0
+ use_svpdrc =
0
-else ifneq (,$(findstring ios_static,$(platform)))
- TARGET := $(TARGET_NAME)_libretro_ios.a
+# iOS
+else ifneq (,$(findstring ios,$(platform)))
+ TARGET := $(TARGET_NAME)_libretro_ios.dylib
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
@@
-124,13
+115,19
@@
else ifneq (,$(findstring ios_static,$(platform)))
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
CFLAGS += -DIOS
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
CFLAGS += -DIOS
+ifeq ($(platform),ios9)
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
+else
+ CC += -miphoneos-version-min=5.0
+ CXX += -miphoneos-version-min=5.0
+ CC_AS += -miphoneos-version-min=5.0
+ CFLAGS += -miphoneos-version-min=5.0
+endif
ARCH := arm
ARCH := arm
- STATIC_LINKING = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cyclone = 0
use_fame = 1
use_drz80 = 0