diff options
| author | Sam Bingner <sam@bingner.com> | 2018-10-12 16:13:20 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-10-12 16:13:20 -1000 |
| commit | 8d0b09ed02097b976fb1996e3f9102f3130ce16e (patch) | |
| tree | 1ae54dd237862c2f6fddbcbe5b99284969f6e885 /data/uikittools/telesphoreo.diff | |
| parent | a5bb9c53c298e135a87db45105546d69a1cb51de (diff) | |
Update uikittools
Diffstat (limited to 'data/uikittools/telesphoreo.diff')
| -rw-r--r-- | data/uikittools/telesphoreo.diff | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/data/uikittools/telesphoreo.diff b/data/uikittools/telesphoreo.diff index 965ebe42b..73beb99dc 100644 --- a/data/uikittools/telesphoreo.diff +++ b/data/uikittools/telesphoreo.diff @@ -1,14 +1,15 @@ -diff -ur uikittools/makefile uikittools+telesphoreo/makefile ---- uikittools/makefile 2018-07-31 14:40:26.000000000 -1000 -+++ uikittools+telesphoreo/makefile 2018-07-31 15:23:32.000000000 -1000 +diff --git a/makefile b/makefile +index 6764f73..055bbf8 100644 +--- a/makefile ++++ b/makefile @@ -1,4 +1,6 @@ - uikittools = uiduid uicache uiopen gssc sbdidlaunch sbreload cfversion iomfsetgamma ldrestart + uikittools = uiduid uicache uiopen gssc sbdidlaunch sbreload cfversion iomfsetgamma ldrestart ecidecid +CC = $(PKG_TARG)-gcc +CPP = $(PKG_TARG)-g++ all: $(uikittools) -@@ -9,11 +11,9 @@ +@@ -9,11 +11,9 @@ clean: private := -F/System/Library/PrivateFrameworks @@ -21,16 +22,24 @@ diff -ur uikittools/makefile uikittools+telesphoreo/makefile ldrestart := -std=c++11 gssc := -lobjc -@@ -28,27 +28,23 @@ +@@ -28,31 +28,29 @@ uicache: csstore.cpp extrainst_: csstore.cpp + %: %.m +- cycc -- -o $@ -x c $^ $(flags) $($@) ++ $(CC) -o $@ $^ $(flags) $($@) +- ldid -S$(wildcard $@.xml) $@ ++ @if [ ! -z "$(wildcard $@.xml)" ]; then \ ++ ldid -S$(wildcard $@.xml) $@; \ ++ fi + %: %.mm - cycc -- -o $@ $^ $(flags) $($@) - ldid -S$(wildcard $@.xml) $@ + $(CPP) -o $@ $^ $(flags) $($@) + @if [ ! -z "$(wildcard $@.xml)" ]; then \ + ldid -S$(wildcard $@.xml) $@; \ -+ fi ++ fi %: %.cpp - cycc -- -o $@ $^ $(flags) $($@) @@ -38,7 +47,7 @@ diff -ur uikittools/makefile uikittools+telesphoreo/makefile + $(CPP) -o $@ $^ $(flags) $($@) + @if [ ! -z "$(wildcard $@.xml)" ]; then \ + ldid -S$(wildcard $@.xml) $@; \ -+ fi ++ fi %: %.c - cycc -- -o $@ -x c $^ $(flags) $($@) @@ -60,7 +69,7 @@ diff -ur uikittools/makefile uikittools+telesphoreo/makefile + $(CC) -o $@ -x c $^ $(flags) $($@) + @if [ ! -z "$(wildcard $@.xml)" ]; then \ + ldid -S$(wildcard $@.xml) $@; \ -+ fi ++ fi + +install: all + mkdir -p $(DESTDIR)/usr/bin |