Use xcode-select --print-path to find /Developer.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index abc07de6b7166f5a0408aef17f91bc0b7ed91318..4e34967260ab719dce7117607e2451ed9c1deeaf 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,11 +1,20 @@
-sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+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))
+
+# 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
+
 flags := 
 link := 
+libs := 
 
 ifeq (o,O) # gzip is actually better
 dpkg := /Library/Cydia/bin/dpkg-deb
@@ -21,36 +30,46 @@ endif
 sdk := $(sdks)/iPhoneOS$(ios).sdk
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
-flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
-flags += -Wall -Werror -Wno-deprecated-declarations
+flags += -I. -isystem sysroot/usr/include
 flags += -fmessage-length=0
 flags += -g0 -O2
+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
-flags += -fvisibility=hidden
+endif
+
+flags += -Wno-deprecated-declarations
 
 xflags :=
 xflags += -fobjc-call-cxx-cdtors
 xflags += -fvisibility-inlines-hidden
 
-link += -framework CoreFoundation
-link += -framework CoreGraphics
-link += -framework Foundation
-link += -framework GraphicsServices
-link += -framework IOKit
-link += -framework JavaScriptCore
-link += -framework QuartzCore
-link += -framework SpringBoardServices
-link += -framework SystemConfiguration
-link += -framework WebCore
-link += -framework WebKit
-
-link += -lapr-1
-link += -lapt-pkg
-link += -lpcre
-
+link += -Lsysroot/usr/lib
 link += -multiply_defined suppress
 
+libs += -framework CoreFoundation
+libs += -framework CoreGraphics
+libs += -framework Foundation
+libs += -framework GraphicsServices
+libs += -framework IOKit
+libs += -framework JavaScriptCore
+libs += -framework QuartzCore
+libs += -framework SpringBoardServices
+libs += -framework SystemConfiguration
+libs += -framework WebCore
+libs += -framework WebKit
+
+libs += -lapr-1
+libs += -lapt-pkg
+libs += -lpcre
+
 uikit := 
 uikit += -framework UIKit
 
@@ -59,9 +78,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$@
-gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
-cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
+
+ifneq ($(gcc),)
+cycc += -Xarch_armv6 -mcpu=arm1176jzf-s
+endif
 
 dirs := Menes CyteKit Cydia SDURLCache
 
@@ -94,17 +116,17 @@ clean:
 Objects/%.o: %.c $(header)
        @mkdir -p $(dir $@)
        @echo "[cycc] $<"
-       @$(cycc) -c -o $@ -x c $<
+       @$(cycc) -c -x c $<
 
 Objects/%.o: %.m $(header)
        @mkdir -p $(dir $@)
        @echo "[cycc] $<"
-       @$(cycc) -c -o $@ $< $(flags)
+       @$(cycc) -c $< $(flags)
 
 Objects/%.o: %.mm $(header)
        @mkdir -p $(dir $@)
        @echo "[cycc] $<"
-       @$(cycc) -c -o $@ $< $(flags) $(xflags)
+       @$(cycc) -c $< $(flags) $(xflags)
 
 Objects/Version.o: version.h
 
@@ -118,24 +140,25 @@ sysroot: sysroot.sh
        @echo 1>&2
        @exit 1
 
-MobileCydia: sysroot $(object)
+MobileCydia: sysroot $(object) entitlements.xml
        @echo "[link] $(object:Objects/%=%)"
-       @$(cycc) $(filter %.o,$^) $(flags) $(link) $(uikit)
+       @$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit)
+       @mkdir -p bins
        @cp -a $@ bins/$@-$(version)
        @echo "[strp] $@"
        @strip -no_uuid $@
        @echo "[sign] $@"
-       @ldid -T0 -Slaunch.xml $@ || { rm -f $@ && false; }
+       @ldid -T0 -Sentitlements.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm
-       $(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
+       $(cycc) $(filter %.mm,$^) $(flags) $(link) -bundle $(libs) $(backrow)
 
 cfversion: cfversion.mm
        $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation
        @ldid -T0 -S $@
 
 postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
-       $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
+       $(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
        @ldid -T0 -S $@
 
 debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh