Remove the April Fools joke thing.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index f98a9029ac6d20e1832ef54d047620b5a0b49d18..051973977bd0c881d594a00854b26dbef520922c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-dev := /Developer/Platforms/iPhoneOS.platform/Developer
+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))
 sdks := $(dev)/SDKs
 ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
 ios := $(word $(words $(ioss)),$(ioss))


@@ -9,7 +9,7 @@ gcc := 4.2
 ifeq ($(gcc),)
 gxx := $(dev)/usr/bin/clang++
 else
 ifeq ($(gcc),)
 gxx := $(dev)/usr/bin/clang++
 else

-gxx := $(dev)/usr/bin/g++-$(gcc)
+gxx := $(dev)/usr/bin/g++

 endif
 
 flags := 
 endif
 
 flags := 


@@ -78,9 +78,13 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV
 
 version := $(shell ./version.sh)
 
 
 version := $(shell ./version.sh)
 

-cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
+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 = cycc -r4.2 -i$(ios) -o$@
 

+ifneq ($(gcc),)
+cycc += -Xarch_armv6 -mcpu=arm1176jzf-s
+endif
+

 dirs := Menes CyteKit Cydia SDURLCache
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
 dirs := Menes CyteKit Cydia SDURLCache
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))


@@ -124,7 +128,7 @@ Objects/%.o: %.mm $(header)
        @echo "[cycc] $<"
        @$(cycc) -c $< $(flags) $(xflags)
 
        @echo "[cycc] $<"
        @$(cycc) -c $< $(flags) $(xflags)
 

-Objects/Version.o: version.h
+Objects/Version.o: Version.h

 
 Images/%.png: %.png
        @mkdir -p $(dir $@)
 
 Images/%.png: %.png
        @mkdir -p $(dir $@)


@@ -157,7 +161,7 @@ postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKi
        $(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
        @ldid -T0 -S $@
 
        $(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
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh Library/startup

        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        
        sudo rm -rf _
        mkdir -p _/var/lib/cydia