Objective-C seriously didn't notice my mistake :/.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index a0d3732b06c6c62208f5d91b09b09269b37f3b72..d503c3907408a22298ab08f0f2d1440726dcf1e6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -8,17 +8,32 @@ flag :=
 plus :=
 link := 
 libs := 
+lapt := 
 
-gxx := $(shell xcrun --sdk iphoneos -f g++)
+ifeq ($(doIA),yes)
+kind := iphonesimulator
+arch := x86_64
+else
+kind := iphoneos
+arch := arm64
+endif
+
+gxx := $(shell xcrun --sdk $(kind) -f g++)
 cycc := $(gxx)
 
-sdk := $(shell xcodebuild -sdk iphoneos -version Path)
+sdk := $(shell xcodebuild -sdk $(kind) -version Path)
 mac := $(shell xcodebuild -sdk macosx -version Path)
 
 cycc += -isysroot $(sdk)
 cycc += -idirafter $(mac)/usr/include
 cycc += -F$(sdk)/System/Library/PrivateFrameworks
 
+ifeq ($(doIA),yes)
+cycc += -Xarch_x86_64 -F$(sdk)/../../../../iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/PrivateFrameworks
+endif
+
+cycc += -include system.h
+
 cycc += -fmessage-length=0
 cycc += -gfull -O2
 cycc += -fvisibility=hidden
@@ -33,8 +48,11 @@ iapt += -Iapt32-deb
 iapt += -Iapt-extra
 iapt += -IObjects/apt32
 
+ifeq ($(do32),yes)
 flag += $(patsubst %,-Xarch_armv6 %,$(iapt))
-flag += $(patsubst %,-Xarch_arm64 %,$(subst apt32,apt64,$(iapt)))
+endif
+
+flag += $(patsubst %,-Xarch_$(arch) %,$(subst apt32,apt64,$(iapt)))
 
 flag += -I.
 flag += -isystem sysroot/usr/include
@@ -64,22 +82,25 @@ libs += -framework IOKit
 libs += -framework QuartzCore
 libs += -framework SpringBoardServices
 libs += -framework SystemConfiguration
-libs += -framework WebCore
 libs += -framework WebKit
 
 libs += -framework CFNetwork
-libs += -llockdown
 
+ifeq ($(do32),yes)
+libs += -framework WebCore
+libs += -llockdown
 libs += -Xarch_armv6 -Wl,-force_load,Objects/libapt32.a
-libs += -Xarch_arm64 -Wl,-force_load,Objects/libapt64.a
+lapt += Objects/libapt32.a
+endif
+
+libs += -Xarch_$(arch) -Wl,-force_load,Objects/libapt64.a
+lapt += Objects/libapt64.a
 
 libs += -licucore
 
 uikit := 
 uikit += -framework UIKit
 
-link += -Xarch_armv6 -Wl,-segalign,4000
-
 dirs := Menes CyteKit Cydia SDURLCache
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
@@ -122,22 +143,21 @@ libapt64 := $(filter-out %/srvrec.cc,$(libapt64))
 libapt64 := $(patsubst %.cc,Objects/%.o,$(libapt64))
 
 link += -Wl,-liconv
-link += -Xarch_arm64 -Wl,-lz
+link += -Xarch_$(arch) -Wl,-lz
 
 flag += -DAPT_PKG_EXPOSE_STRING_VIEW
 flag += -Dsighandler_t=sig_t
 
+ifeq ($(do32),yes)
 flag32 := 
 flag32 += -arch armv6
 flag32 += -Xarch_armv6 -miphoneos-version-min=2.0
 flag32 += -Xarch_armv6 -marm # @synchronized
 flag32 += -Xarch_armv6 -mcpu=arm1176jzf-s
 flag32 += -mllvm -arm-reserve-r9
-link += -Xarch_armv6 -Wl,-lgcc_s.1
 
-flag64 := 
-flag64 += -arch arm64
-flag64 += -Xarch_arm64 -miphoneos-version-min=7.0
+link += -Xarch_armv6 -Wl,-lgcc_s.1
+link += -Xarch_armv6 -Wl,-segalign,4000
 
 apt32 := $(cycc) $(flag32) $(flag)
 apt32 += -Wno-deprecated-register
@@ -146,6 +166,11 @@ apt32 += -Wno-tautological-compare
 apt32 += -Wno-uninitialized
 apt32 += -Wno-unused-private-field
 apt32 += -Wno-unused-variable
+endif
+
+flag64 := 
+flag64 += -arch $(arch)
+flag64 += -Xarch_$(arch) -m$(kind)-version-min=7.0
 
 apt64 := $(cycc) $(flag64) $(flag)
 apt64 += -include apt.h
@@ -161,7 +186,10 @@ eapt += -Wno-format
 eapt += -Wno-logical-op-parentheses
 iapt += $(eapt)
 
+ifeq ($(do32),yes)
 cycc += $(flag32)
+endif
+
 cycc += $(flag64)
 
 plus += -std=c++11
@@ -177,10 +205,10 @@ clean:
        rm -f MobileCydia postinst
        rm -rf Objects/ Images/
 
-Objects/apt64/apt-pkg/tagfile.o: apt64/apt-pkg/tagfile-keys.cc
-Objects/apt64/apt-pkg/deb/deblistparser.o: apt64/apt-pkg/tagfile-keys.cc
+Objects/apt64/apt-pkg/tagfile.o: Objects/apt64/apt-pkg/tagfile-keys.h
+Objects/apt64/apt-pkg/deb/deblistparser.o: Objects/apt64/apt-pkg/tagfile-keys.h
 
-apt64/apt-pkg/tagfile-keys.cc:
+Objects/apt64/apt-pkg/tagfile-keys%h apt64/apt-pkg/tagfile-keys%cc:
        mkdir -p apt64
        mkdir -p Objects/apt64/apt-pkg
        cd apt64 && ../apt64/triehash/triehash.pl \
@@ -192,7 +220,7 @@ apt64/apt-pkg/tagfile-keys.cc:
             --function-name pkgTagHash \
             --include "<apt-pkg/tagfile.h>" \
             ../apt64/apt-pkg/tagfile-keys.list
-       sed -i -e 's@typedef char static_assert64@//\\0@' $@
+       sed -i -e 's@typedef char static_assert64@//\\0@' apt64/apt-pkg/tagfile-keys.cc
 
 Objects/%.o: %.cc $(header)
        @mkdir -p $(dir $@)
@@ -235,6 +263,7 @@ Images/%.png: %.png
        @mkdir -p $(dir $@)
        @echo "[pngc] $<"
        @./pngcrush.sh $< $@
+       @touch $@
 
 sysroot: sysroot.sh
        @echo "Your ./sysroot/ is either missing or out of date. Please read compiling.txt for help." 1>&2
@@ -249,7 +278,7 @@ Objects/libapt64.a: $(libapt64)
        @echo "[arch] $@"
        @ar -rc $@ $^
 
-MobileCydia: $(object) entitlements.xml Objects/libapt32.a Objects/libapt64.a
+MobileCydia: $(object) entitlements.xml $(lapt)
        @echo "[link] $@"
        @$(cycc) -o $@ $(filter %.o,$^) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0
        @mkdir -p bins
@@ -273,7 +302,7 @@ cydo: cydo.cpp
        $(cycc) $(plus) -o $@ $(filter %.cpp,$^) $(flag) $(link) -Wno-deprecated-writable-strings
        @ldid -T0 -S $@
 
-postinst: postinst.mm CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+postinst: postinst.mm CyteKit/stringWith.mm CyteKit/stringWith.h CyteKit/UCPlatform.h
        $(cycc) $(plus) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation -framework Foundation -framework UIKit
        @ldid -T0 -S $@