X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/ab55ac63927f883f561f07b26ab79bc470e82795..fa2bffc41753cdb90ad2428d6358bda8d46f2530:/makefile

diff --git a/makefile b/makefile
index cd9ce92..6094676 100644
--- a/makefile
+++ b/makefile
@@ -6,25 +6,21 @@ endif
 
 substrate := -I../mobilesubstrate -L../mobilesubstrate -lsubstrate
 
-all: WinterBoard WinterBoard.dylib UIImages WinterBoardSettings Optimize
+all: WinterBoard WinterBoard.dylib WinterBoardSettings Optimize
 
 clean:
-	rm -f WinterBoard WinterBoard.dylib UIImages
+	rm -f WinterBoard WinterBoard.dylib
 
 WinterBoardSettings: Settings.mm makefile
 	$(target)g++ -dynamiclib -g0 -O2 -Wall -o $@ $(filter %.mm,$^) -framework UIKit -framework CoreFoundation -framework Foundation -lobjc -framework CoreGraphics -framework Preferences -F$(PKG_ROOT)/System/Library/PrivateFrameworks
 	ldid -S $@
 
-WinterBoard.dylib: Library.mm makefile ../mobilesubstrate/substrate.h
-	$(target)g++ -dynamiclib -g0 -O2 -Wall -o $@ $(filter %.mm,$^) -framework CoreFoundation -framework Foundation -lobjc -init _WBInitialize -I/apl/inc/iPhoneOS-2.0 -framework CoreGraphics -framework ImageIO -framework GraphicsServices -framework Celestial $(substrate) -framework UIKit -F$(PKG_ROOT)/System/Library/PrivateFrameworks
-	ldid -S $@
-
-UIImages: UIImages.mm makefile
-	$(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc -I/apl/inc/iPhoneOS-2.0 $(substrate)
+WinterBoard.dylib: Library.mm WBMarkup.mm WBMarkup.h makefile ../mobilesubstrate/substrate.h
+	$(target)g++ -dynamiclib -g0 -O2 -Wall -o $@ $(filter %.mm,$^) -framework CoreFoundation -framework Foundation -lobjc -I/apl/inc/iPhoneOS-2.0 -framework CoreGraphics -framework ImageIO -framework GraphicsServices -framework Celestial $(substrate) -framework UIKit -framework WebCore -framework WebKit -F$(PKG_ROOT)/System/Library/PrivateFrameworks
 	ldid -S $@
 
 WinterBoard: Application.mm makefile
-	$(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc -framework CoreGraphics -I/apl/sdk -framework Preferences -F$(PKG_ROOT)/System/Library/PrivateFrameworks
+	$(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc -framework CoreGraphics -I/apl/sdk -framework Preferences -F$(PKG_ROOT)/System/Library/PrivateFrameworks $(substrate)
 	ldid -S $@
 
 Optimize: Optimize.cpp makefile
@@ -45,6 +41,7 @@ package: all
 	cp -a WinterBoardSettings.plist winterboard/Library/PreferenceLoader/Preferences
 	cp -a WinterBoardSettings.bundle winterboard/System/Library/PreferenceBundles
 	cp -a Icon-Small.png winterboard/System/Library/PreferenceBundles/WinterBoardSettings.bundle/icon.png
+	cp -a Icon-Small@2x.png winterboard/System/Library/PreferenceBundles/WinterBoardSettings.bundle/icon@2x.png
 	cp -a SearchResultsCheckmarkClear.png WinterBoardSettings winterboard/System/Library/PreferenceBundles/WinterBoardSettings.bundle
 	ln -s /Applications/WinterBoard.app/WinterBoard.dylib winterboard/Library/MobileSubstrate/DynamicLibraries
 	cp -a WinterBoard.plist winterboard/Library/MobileSubstrate/DynamicLibraries
@@ -52,7 +49,8 @@ package: all
 	find winterboard -name .svn | while read -r line; do rm -rf "$${line}"; done
 	cp -a extrainst_ preinst prerm winterboard/DEBIAN
 	sed -e 's/VERSION/$(shell ./version.sh)/g' control >winterboard/DEBIAN/control
-	cp -a Test.sh Icon-Small.png icon.png WinterBoard.dylib WinterBoard UIImages Info.plist winterboard/Applications/WinterBoard.app
-	dpkg-deb -b winterboard "winterboard_$$(grep ^Version: winterboard/DEBIAN/control | cut -d ' ' -f 2)_iphoneos-arm.deb"
+	cp -a Test.sh Icon-Small.png icon.png icon-72.png icon@2x.png WinterBoard.dylib WinterBoard Info.plist winterboard/Applications/WinterBoard.app
+	file="winterboard_$$(grep ^Version: winterboard/DEBIAN/control | cut -d ' ' -f 2)_iphoneos-arm.deb"; echo "$$file"; ln -sf "$$file" winterboard.deb
+	dpkg-deb -b winterboard winterboard.deb
 
 .PHONY: all clean package