[global] switch from using system libswift to packaged swift 3.1.1

hbang · Jun 6, 2017 · f1420b2 · f1420b2
1 parent 0ce11de
commit f1420b2
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
 .DS_Store
 .theos
 packages
-
-libswiftQuartzCore.dylib
diff --git a/Makefile b/Makefile
@@ -26,10 +26,6 @@ SUBPROJECTS += widget notification-content provider prefs postinst app
 include $(THEOS_MAKE_PATH)/aggregate.mk
 endif
 
-after-stage::
-	$(ECHO_NOTHING)mkdir -p $(THEOS_STAGING_DIR)/Applications/Canzone.app/Frameworks$(ECHO_END)
-	$(ECHO_NOTHING)cp libswiftQuartzCore.dylib $(THEOS_STAGING_DIR)/Applications/Canzone.app/Frameworks$(ECHO_END)
-
 after-install::
 ifeq ($(RESPRING),0)
 	install.exec "uiopen prefs:root=Canzone"

diff --git a/control b/control
@@ -1,6 +1,6 @@
 Package: ws.hbang.canzone
 Name: Canzone
-Depends: firmware (>= 10.0), firmware (<< 10.3), mobilesubstrate, preferenceloader, ws.hbang.common (>= 1.11)
+Depends: firmware (>= 10.0), firmware (<< 10.3), cy+cpu.arm64, mobilesubstrate, preferenceloader, ws.hbang.common (>= 1.11), org.swift.libswift-3.1-arm64 (>= 3.1.1)
 Suggests: ws.hbang.typestatusplus
 Conflicts: ws.hbang.typestatusplusproviders (<< 1.1)
 Replaces: ws.hbang.typestatusplusproviders (<< 1.1)

diff --git a/notification-content/Makefile b/notification-content/Makefile
@@ -7,6 +7,5 @@ CanzoneNotificationContent_FRAMEWORKS = UserNotifications UserNotificationsUI
 CanzoneNotificationContent_PRIVATE_FRAMEWORKS = MediaPlayerUI MediaRemote
 CanzoneNotificationContent_EXTRA_FRAMEWORKS = Cephei
 CanzoneNotificationContent_SWIFT_BRIDGING_HEADER = BridgingHeader.h
-CanzoneNotificationContent_LDFLAGS = -L.. -lswiftQuartzCore
 
 include $(THEOS_MAKE_PATH)/appex.mk