notaz.gp2x.de
/
picodrive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c98b37a
)
Add staticios target (for iOS 8 and later)
author
Twinaphex
<libretro@gmail.com>
Tue, 21 Feb 2017 23:11:27 +0000
(
00:11
+0100)
committer
Twinaphex
<libretro@gmail.com>
Tue, 21 Feb 2017 23:11:27 +0000
(
00:11
+0100)
Makefile.libretro
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
b2ccc41
..
d1a7502
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-73,11
+73,8
@@
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)
APPLE := 1
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
@@
-89,19
+86,13
@@
else ifneq (,$(findstring ios,$(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
@@
-109,8
+100,9
@@
endif
use_sh2drc = 1
use_svpdrc = 1
use_sh2drc = 1
use_svpdrc = 1
-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
+116,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