summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2014-05-16 20:26:07 -0700
committerJay Freeman (saurik) <saurik@saurik.com>2014-05-16 20:26:07 -0700
commit3e5a9f5d3097f16c99b57d476c986e13325762c5 (patch)
treec75a40c3b91fa1a5b928e5cbfc670356a16b3de4 /makefile
parent20d59843c0902fc663f66f32cb906cbe7869cb57 (diff)
Port build environment to Xcode 5.0.2 (iOS 7 SDK).
Diffstat (limited to 'makefile')
-rw-r--r--makefile51
1 files changed, 11 insertions, 40 deletions
diff --git a/makefile b/makefile
index 8719157..4beeadf 100644
--- a/makefile
+++ b/makefile
@@ -1,36 +1,11 @@
-dev := $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer
-sdks := $(dev)/SDKs
-ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
-ios := $(word $(words $(ioss)),$(ioss))
-
-# XXX: as of iOS 6.x armv6 is not supported :(
-ios := 5.1
-
-# if you can tolerate clang, set this to blank
-gcc := 4.2
-
-ifeq ($(gcc),)
-gxx := $(dev)/usr/bin/clang++
-else
-gxx := $(dev)/usr/bin/g++
-endif
+gxx := $(shell xcrun --sdk iphoneos -f g++)
+sdk := $(shell xcodebuild -sdk iphoneos -version Path)
flags :=
link :=
libs :=
-ifeq (o,O) # gzip is actually better
-dpkg := /Library/Cydia/bin/dpkg-deb
-ifeq ($(wildcard $(dpkg)),$(dpkg))
-dpkg := $(dpkg) -zlzma
-else
-dpkg := dpkg-deb -zbzip2
-endif
-else
-dpkg := dpkg-deb
-endif
-
-sdk := $(sdks)/iPhoneOS$(ios).sdk
+dpkg := dpkg-deb -Zlzma
flags += -F$(sdk)/System/Library/PrivateFrameworks
flags += -I. -isystem sysroot/usr/include
@@ -40,14 +15,10 @@ flags += -fvisibility=hidden
flags += -Wall
-ifeq ($(gcc),)
flags += -Wno-unknown-warning-option
flags += -Wno-logical-op-parentheses
-else
-flags += -fobjc-exceptions
-flags += -fno-guess-branch-probability
-endif
-
+flags += -Wno-dangling-else
+flags += -Wno-shift-op-parentheses
flags += -Wno-deprecated-declarations
xflags :=
@@ -80,12 +51,12 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV
version := $(shell ./version.sh)
-cycc = $(gxx) -mthumb -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
-#cycc = cycc -r4.2 -i$(ios) -o$@
+cycc = $(gxx) -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
-ifneq ($(gcc),)
-cycc += -Xarch_armv6 -mcpu=arm1176jzf-s
-endif
+cycc += -marm # @synchronized
+cycc += -mcpu=arm1176jzf-s
+cycc += -mllvm -arm-reserve-r9
+link += -lgcc_s.1
dirs := Menes CyteKit Cydia SDURLCache
@@ -158,7 +129,7 @@ CydiaAppliance: CydiaAppliance.mm
$(cycc) $(filter %.mm,$^) $(flags) $(link) -bundle $(libs) $(backrow)
cfversion: cfversion.mm
- $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation
+ $(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation
@ldid -T0 -S $@
postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h