notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eae1ae0
)
Update Makefile
author
twinaphex
<libretro@gmail.com>
Thu, 23 Oct 2014 07:36:14 +0000
(09:36 +0200)
committer
twinaphex
<libretro@gmail.com>
Thu, 23 Oct 2014 07:36:14 +0000
(09:36 +0200)
Makefile.libretro
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
7c16422
..
b92cea4
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-33,8
+33,9
@@
else ifeq ($(platform), osx)
SHARED := -dynamiclib
BUILTIN_GPU = neon
CFLAGS += -DNEON_PC
SHARED := -dynamiclib
BUILTIN_GPU = neon
CFLAGS += -DNEON_PC
-OSXVER = `sw_vers -productVersion | cut -c 4`
-ifneq ($(OSXVER),9)
+ OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+ OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+ifeq ($(OSX_LT_MAVERICKS),"YES")
fpic += -mmacosx-version-min=10.5
endif
else ifeq ($(platform), ios)
fpic += -mmacosx-version-min=10.5
endif
else ifeq ($(platform), ios)
@@
-43,6
+44,10
@@
ARCH := arm
fpic := -fPIC
SHARED := -dynamiclib
fpic := -fPIC
SHARED := -dynamiclib
+ifeq ($(IOSSDK),)
+ IOSSDK := $(shell xcrun -sdk iphoneos -show-sdk-path)
+endif
+
CC = clang -arch armv7 -isysroot $(IOSSDK)
CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
CC = clang -arch armv7 -isysroot $(IOSSDK)
CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
@@
-52,8
+57,9
@@
ARCH := arm
BUILTIN_GPU = neon
USE_DYNAREC = 1
CFLAGS += -DIOS
BUILTIN_GPU = neon
USE_DYNAREC = 1
CFLAGS += -DIOS
-OSXVER = `sw_vers -productVersion | cut -c 4`
-ifneq ($(OSXVER),9)
+ OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+ OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+ifeq ($(OSX_LT_MAVERICKS),"YES")
CC += -miphoneos-version-min=5.0
CXX += -miphoneos-version-min=5.0
CC_AS += -miphoneos-version-min=5.0
CC += -miphoneos-version-min=5.0
CXX += -miphoneos-version-min=5.0
CC_AS += -miphoneos-version-min=5.0