Commit @3x logic (as it is getting in my way :/).

[winterboard.git] / makefile

diff --git a/makefile b/makefile
index 6ae658ad6e502e48e5a8638c0a266886284c7040..61c99edc587576cf713f1374e5df0cf02feb46bd 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,31 +1,46 @@
-ifndef PKG_TARG
-target :=
-else
-target := $(PKG_TARG)-
-endif
+cycc = cycc -i2.0 -o$@ -- $(filter %.mm,$^) -g0 -O2 -Werror -Iiphone-api -F/System/Library/PrivateFrameworks -Xarch_armv6 -marm
 
-all: WinterBoard WinterBoard.dylib UIImages
+substrate := -I../substrate -L../substrate -lsubstrate
+
+all: WinterBoard WinterBoard.dylib WinterBoardSettings Optimize
 
 clean:
-       rm -f WinterBoard WinterBoard.dylib UIImages
+       rm -f WinterBoard WinterBoard.dylib WinterBoardSettings Optimize
 
-WinterBoard.dylib: Library.mm makefile
-       $(target)g++ -dynamiclib -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework CoreFoundation -framework Foundation -lobjc -init _WBInitialize -I/apl/inc/iPhoneOS-2.0 -framework CoreGraphics
+WinterBoardSettings: Settings.mm makefile
+       $(cycc) -dynamiclib \
+           -framework UIKit \
+           -framework CoreFoundation \
+           -framework Foundation \
+           -framework CoreGraphics \
+           -framework Preferences \
+           -lobjc
 
-UIImages: UIImages.mm makefile
-       $(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc
+WinterBoard.dylib: Library.mm WBMarkup.mm WBMarkup.h makefile ../substrate/substrate.h
+       $(cycc) -std=c++11 -dynamiclib \
+           -framework CoreFoundation \
+           -framework Foundation \
+           -framework CoreGraphics \
+           -framework GraphicsServices \
+           -framework Celestial \
+           -framework UIKit \
+           -framework WebCore \
+           -framework WebKit \
+           -lobjc $(substrate)
 
 WinterBoard: Application.mm makefile
-       $(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc -framework CoreGraphics
-
-package:
-       rm -rf winterboard
-       mkdir -p winterboard/DEBIAN
-       mkdir -p winterboard/Applications/WinterBoard.app
-       mkdir -p winterboard/Library/Themes
-       cp -a Nature winterboard/Library/Themes/com.saurik.WinterBoard.Nature
-       cp -a control preinst postinst prerm winterboard/DEBIAN
-       cp -a Test.sh icon.png WinterBoard.dylib WinterBoard UIImages Info.plist ../pledit/pledit winterboard/Applications/WinterBoard.app
-       dpkg-deb -b winterboard winterboard_0.9.2504-1_iphoneos-arm.deb
+       $(cycc) \
+           -framework UIKit \
+           -framework Foundation \
+           -framework CoreFoundation \
+           -framework CoreGraphics \
+           -framework Preferences \
+           -lobjc
+
+Optimize: Optimize.cpp makefile
+       $(cycc) $(filter %.cpp,$^)
+
+package: all
+       sudo ./package.sh
 
 .PHONY: all clean package