From f8ad89c327c41966673084932a2508d072d718bf Mon Sep 17 00:00:00 2001 From: therecipe Date: Fri, 17 Jun 2016 19:58:43 +0200 Subject: [PATCH] fix iOS --- README.md | 6 +++--- internal/binding/templater/cgo.go | 7 ++++--- internal/binding/templater/templater.go | 2 +- internal/deploy/deploy.go | 4 ++-- qml/cgo_darwin_386.go | 2 +- qml/cgo_darwin_arm.go | 2 +- qml/cgo_darwin_arm64.go | 2 +- quick/cgo_darwin_386.go | 2 +- quick/cgo_darwin_arm.go | 2 +- quick/cgo_darwin_arm64.go | 2 +- webchannel/cgo_darwin_386.go | 2 +- webchannel/cgo_darwin_arm.go | 2 +- webchannel/cgo_darwin_arm64.go | 2 +- 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 3d925484..d8d58fa5 100755 --- a/README.md +++ b/README.md @@ -129,9 +129,9 @@ 1. Set up the desktop version 2. Install VirtualBox - * http://download.virtualbox.org/virtualbox/5.0.20/VirtualBox-5.0.20-106931-Win.exe - * http://download.virtualbox.org/virtualbox/5.0.20/VirtualBox-5.0.20-106931-OSX.dmg - * http://download.virtualbox.org/virtualbox/5.0.20/VirtualBox-5.0.20-106931-Linux_amd64.run + * http://download.virtualbox.org/virtualbox/5.0.22/VirtualBox-5.0.22-108108-Win.exe + * http://download.virtualbox.org/virtualbox/5.0.22/VirtualBox-5.0.22-108108-OSX.dmg + * http://download.virtualbox.org/virtualbox/5.0.22/VirtualBox-5.0.22-108108-Linux_amd64.run 3. Install the Sailfish OS SDK in `C:\SailfishOS\` or `/opt/SailfishOS/` * http://releases.sailfishos.org/sdk/installers/1602/SailfishOSSDK-Beta-1602-Qt5-windows-offline.exe diff --git a/internal/binding/templater/cgo.go b/internal/binding/templater/cgo.go index c18542d6..8c26012e 100755 --- a/internal/binding/templater/cgo.go +++ b/internal/binding/templater/cgo.go @@ -407,7 +407,7 @@ func cgoIos(module string) string { if module != "Quick" { tmp += " -lQt5Quick_iphonesimulator -lQt5QuickParticles_iphonesimulator -lQt5QuickTest_iphonesimulator -lQt5QuickWidgets_iphonesimulator" } - tmp += " -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_server_iphonesimulator -lqmldbg_tcp_iphonesimulator" + tmp += " -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_quickprofiler_iphonesimulator -lqmldbg_server_iphonesimulator -lQt5PacketProtocol_iphonesimulator -lqmldbg_tcp_iphonesimulator" } case "Purchasing": @@ -420,7 +420,7 @@ func cgoIos(module string) string { tmp += " -lQt5OpenGL_iphonesimulator" tmp += " -F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks -weak_framework XCTest" tmp += " -lQt5Quick_iphonesimulator -lQt5QuickParticles_iphonesimulator -lQt5QuickTest_iphonesimulator -lQt5QuickWidgets_iphonesimulator" - tmp += " -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_server_iphonesimulator -lqmldbg_tcp_iphonesimulator" + tmp += " -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_quickprofiler_iphonesimulator -lqmldbg_server_iphonesimulator -lQt5PacketProtocol_iphonesimulator -lqmldbg_tcp_iphonesimulator" tmp += " -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick.2 -lqtquick2plugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick/Layouts -lqquicklayoutsplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick/Dialogs -ldialogplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick/Controls -lqtquickcontrolsplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/Qt/labs/folderlistmodel -lqmlfolderlistmodelplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/Qt/labs/settings -lqmlsettingsplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick/Dialogs/Private -ldialogsprivateplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick/Window.2 -lwindowplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQml/Models.2 -lmodelsplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtQuick/Extras -lqtquickextrasplugin_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/qml/QtGraphicalEffects/private -lqtgraphicaleffectsprivate_iphonesimulator" tmp += " -L/usr/local/Qt5.7.0/5.7/ios/qml/QtMultimedia -ldeclarative_multimedia_iphonesimulator -lQt5MultimediaQuick_p_iphonesimulator" @@ -556,8 +556,9 @@ func GetiOSClang(buildTarget, buildARM string) []string { tmp = strings.Split(tmp, "/*")[1] tmp = strings.Split(tmp, "*/")[0] - tmp = strings.Replace(tmp, "#cgo LDFLAGS: ", "", -1) + tmp = strings.Replace(tmp, "#cgo CFLAGS: ", "", -1) tmp = strings.Replace(tmp, "#cgo CXXFLAGS: ", "", -1) + tmp = strings.Replace(tmp, "#cgo LDFLAGS: ", "", -1) tmp = strings.Replace(tmp, "\n", " ", -1) if buildTarget == "ios" { diff --git a/internal/binding/templater/templater.go b/internal/binding/templater/templater.go index f5c0a0d2..34d1e569 100755 --- a/internal/binding/templater/templater.go +++ b/internal/binding/templater/templater.go @@ -30,7 +30,7 @@ func GenModule(name string) { //prepare utils.MakeFolder(utils.GetQtPkgPath(pkgName)) CopyCgo(name) - if name == "AndroidExtras" { + if name == "AndroidExtras" && !Minimal { utils.Save(utils.GetQtPkgPath(pkgName, "utils-androidextras_android.go"), utils.Load(utils.GetQtPkgPath("internal", "binding", "files", "utils-androidextras_android.go"))) } manualWeakLink("Qt" + name) diff --git a/internal/deploy/deploy.go b/internal/deploy/deploy.go index 3fe7bf67..550bb32f 100755 --- a/internal/deploy/deploy.go +++ b/internal/deploy/deploy.go @@ -1518,14 +1518,14 @@ Q_IMPORT_PLUGIN(QtQuick2Plugin) Q_IMPORT_PLUGIN(QMultimediaDeclarativeModule) Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin) Q_IMPORT_PLUGIN(QtQuick2DialogsPlugin) -Q_IMPORT_PLUGIN(QtQuickControlsPlugin) +Q_IMPORT_PLUGIN(QtQuickControls1Plugin) Q_IMPORT_PLUGIN(QmlFolderListModelPlugin) Q_IMPORT_PLUGIN(QmlSettingsPlugin) Q_IMPORT_PLUGIN(QtQuick2DialogsPrivatePlugin) Q_IMPORT_PLUGIN(QtQuick2WindowPlugin) Q_IMPORT_PLUGIN(QtQmlModelsPlugin) Q_IMPORT_PLUGIN(QtQuickExtrasPlugin) -Q_IMPORT_PLUGIN(QtGraphicalEffectsPlugin) +//Q_IMPORT_PLUGIN(QtGraphicalEffectsPlugin) ` iosQtConf = `[Paths] diff --git a/qml/cgo_darwin_386.go b/qml/cgo_darwin_386.go index ead0deb4..2f4e7120 100755 --- a/qml/cgo_darwin_386.go +++ b/qml/cgo_darwin_386.go @@ -8,6 +8,6 @@ package qml #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator9.3.sdk -mios-simulator-version-min=7.0 -arch i386 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios_iphonesimulator -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype_iphonesimulator -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds_iphonesimulator -lqicns_iphonesimulator -lqico_iphonesimulator -lqtga_iphonesimulator -lqtiff_iphonesimulator -lqwbmp_iphonesimulator -lqwebp_iphonesimulator -lqtharfbuzzng_iphonesimulator -lz -lqtpcre_iphonesimulator -lm -lQt5Core_iphonesimulator -lQt5Network_iphonesimulator -lQt5Qml_iphonesimulator -lQt5Gui_iphonesimulator -lQt5Quick_iphonesimulator -lQt5QuickParticles_iphonesimulator -lQt5QuickTest_iphonesimulator -lQt5QuickWidgets_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_server_iphonesimulator -lqmldbg_tcp_iphonesimulator -lQt5PlatformSupport_iphonesimulator +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios_iphonesimulator -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype_iphonesimulator -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds_iphonesimulator -lqicns_iphonesimulator -lqico_iphonesimulator -lqtga_iphonesimulator -lqtiff_iphonesimulator -lqwbmp_iphonesimulator -lqwebp_iphonesimulator -lqtharfbuzzng_iphonesimulator -lz -lqtpcre_iphonesimulator -lm -lQt5Core_iphonesimulator -lQt5Network_iphonesimulator -lQt5Qml_iphonesimulator -lQt5Gui_iphonesimulator -lQt5Quick_iphonesimulator -lQt5QuickParticles_iphonesimulator -lQt5QuickTest_iphonesimulator -lQt5QuickWidgets_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_quickprofiler_iphonesimulator -lqmldbg_server_iphonesimulator -lQt5PacketProtocol_iphonesimulator -lqmldbg_tcp_iphonesimulator -lQt5PlatformSupport_iphonesimulator */ import "C" diff --git a/qml/cgo_darwin_arm.go b/qml/cgo_darwin_arm.go index 71497eaa..f439b64f 100755 --- a/qml/cgo_darwin_arm.go +++ b/qml/cgo_darwin_arm.go @@ -8,6 +8,6 @@ package qml #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk -miphoneos-version-min=7.0 -arch armv7 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_server -lqmldbg_tcp -lQt5PlatformSupport +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp -lQt5PlatformSupport */ import "C" diff --git a/qml/cgo_darwin_arm64.go b/qml/cgo_darwin_arm64.go index ae5cc679..9fab5107 100755 --- a/qml/cgo_darwin_arm64.go +++ b/qml/cgo_darwin_arm64.go @@ -8,6 +8,6 @@ package qml #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk -miphoneos-version-min=7.0 -arch arm64 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_server -lqmldbg_tcp -lQt5PlatformSupport +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp -lQt5PlatformSupport */ import "C" diff --git a/quick/cgo_darwin_386.go b/quick/cgo_darwin_386.go index 7fa7c50d..bb825747 100755 --- a/quick/cgo_darwin_386.go +++ b/quick/cgo_darwin_386.go @@ -8,6 +8,6 @@ package quick #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtGui -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtWidgets -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml -I/usr/local/Qt5.7.0/5.7/ios/include/QtQuickWidgets -I/usr/local/Qt5.7.0/5.7/ios/include/QtQuick #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator9.3.sdk -mios-simulator-version-min=7.0 -arch i386 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios_iphonesimulator -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype_iphonesimulator -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds_iphonesimulator -lqicns_iphonesimulator -lqico_iphonesimulator -lqtga_iphonesimulator -lqtiff_iphonesimulator -lqwbmp_iphonesimulator -lqwebp_iphonesimulator -lqtharfbuzzng_iphonesimulator -lz -lqtpcre_iphonesimulator -lm -lQt5Core_iphonesimulator -lQt5Gui_iphonesimulator -lQt5Network_iphonesimulator -lQt5Widgets_iphonesimulator -lQt5Qml_iphonesimulator -lQt5QuickWidgets_iphonesimulator -lQt5Quick_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_server_iphonesimulator -lqmldbg_tcp_iphonesimulator -lQt5PlatformSupport_iphonesimulator +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios_iphonesimulator -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype_iphonesimulator -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds_iphonesimulator -lqicns_iphonesimulator -lqico_iphonesimulator -lqtga_iphonesimulator -lqtiff_iphonesimulator -lqwbmp_iphonesimulator -lqwebp_iphonesimulator -lqtharfbuzzng_iphonesimulator -lz -lqtpcre_iphonesimulator -lm -lQt5Core_iphonesimulator -lQt5Gui_iphonesimulator -lQt5Network_iphonesimulator -lQt5Widgets_iphonesimulator -lQt5Qml_iphonesimulator -lQt5QuickWidgets_iphonesimulator -lQt5Quick_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_quickprofiler_iphonesimulator -lqmldbg_server_iphonesimulator -lQt5PacketProtocol_iphonesimulator -lqmldbg_tcp_iphonesimulator -lQt5PlatformSupport_iphonesimulator */ import "C" diff --git a/quick/cgo_darwin_arm.go b/quick/cgo_darwin_arm.go index 385fa08b..30ab1c59 100755 --- a/quick/cgo_darwin_arm.go +++ b/quick/cgo_darwin_arm.go @@ -8,6 +8,6 @@ package quick #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtGui -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtWidgets -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml -I/usr/local/Qt5.7.0/5.7/ios/include/QtQuickWidgets -I/usr/local/Qt5.7.0/5.7/ios/include/QtQuick #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk -miphoneos-version-min=7.0 -arch armv7 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Gui -lQt5Network -lQt5Widgets -lQt5Qml -lQt5QuickWidgets -lQt5Quick -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_server -lqmldbg_tcp -lQt5PlatformSupport +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Gui -lQt5Network -lQt5Widgets -lQt5Qml -lQt5QuickWidgets -lQt5Quick -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp -lQt5PlatformSupport */ import "C" diff --git a/quick/cgo_darwin_arm64.go b/quick/cgo_darwin_arm64.go index 1f2049a7..556e6b70 100755 --- a/quick/cgo_darwin_arm64.go +++ b/quick/cgo_darwin_arm64.go @@ -8,6 +8,6 @@ package quick #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtGui -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtWidgets -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml -I/usr/local/Qt5.7.0/5.7/ios/include/QtQuickWidgets -I/usr/local/Qt5.7.0/5.7/ios/include/QtQuick #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk -miphoneos-version-min=7.0 -arch arm64 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Gui -lQt5Network -lQt5Widgets -lQt5Qml -lQt5QuickWidgets -lQt5Quick -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_server -lqmldbg_tcp -lQt5PlatformSupport +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Gui -lQt5Network -lQt5Widgets -lQt5Qml -lQt5QuickWidgets -lQt5Quick -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp -lQt5PlatformSupport */ import "C" diff --git a/webchannel/cgo_darwin_386.go b/webchannel/cgo_darwin_386.go index 7be24b0f..d3e16990 100755 --- a/webchannel/cgo_darwin_386.go +++ b/webchannel/cgo_darwin_386.go @@ -8,6 +8,6 @@ package webchannel #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml -I/usr/local/Qt5.7.0/5.7/ios/include/QtWebChannel #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator9.3.sdk -mios-simulator-version-min=7.0 -arch i386 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios_iphonesimulator -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype_iphonesimulator -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds_iphonesimulator -lqicns_iphonesimulator -lqico_iphonesimulator -lqtga_iphonesimulator -lqtiff_iphonesimulator -lqwbmp_iphonesimulator -lqwebp_iphonesimulator -lqtharfbuzzng_iphonesimulator -lz -lqtpcre_iphonesimulator -lm -lQt5Core_iphonesimulator -lQt5Network_iphonesimulator -lQt5Qml_iphonesimulator -lQt5WebChannel_iphonesimulator -lQt5Gui_iphonesimulator -lQt5Quick_iphonesimulator -lQt5QuickParticles_iphonesimulator -lQt5QuickTest_iphonesimulator -lQt5QuickWidgets_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_server_iphonesimulator -lqmldbg_tcp_iphonesimulator -lQt5PlatformSupport_iphonesimulator +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios_iphonesimulator -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype_iphonesimulator -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds_iphonesimulator -lqicns_iphonesimulator -lqico_iphonesimulator -lqtga_iphonesimulator -lqtiff_iphonesimulator -lqwbmp_iphonesimulator -lqwebp_iphonesimulator -lqtharfbuzzng_iphonesimulator -lz -lqtpcre_iphonesimulator -lm -lQt5Core_iphonesimulator -lQt5Network_iphonesimulator -lQt5Qml_iphonesimulator -lQt5WebChannel_iphonesimulator -lQt5Gui_iphonesimulator -lQt5Quick_iphonesimulator -lQt5QuickParticles_iphonesimulator -lQt5QuickTest_iphonesimulator -lQt5QuickWidgets_iphonesimulator -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger_iphonesimulator -lqmldbg_inspector_iphonesimulator -lqmldbg_local_iphonesimulator -lqmldbg_native_iphonesimulator -lqmldbg_profiler_iphonesimulator -lqmldbg_quickprofiler_iphonesimulator -lqmldbg_server_iphonesimulator -lQt5PacketProtocol_iphonesimulator -lqmldbg_tcp_iphonesimulator -lQt5PlatformSupport_iphonesimulator */ import "C" diff --git a/webchannel/cgo_darwin_arm.go b/webchannel/cgo_darwin_arm.go index d8d4b891..dc4d538f 100755 --- a/webchannel/cgo_darwin_arm.go +++ b/webchannel/cgo_darwin_arm.go @@ -8,6 +8,6 @@ package webchannel #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml -I/usr/local/Qt5.7.0/5.7/ios/include/QtWebChannel #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk -miphoneos-version-min=7.0 -arch armv7 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5WebChannel -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_server -lqmldbg_tcp -lQt5PlatformSupport +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5WebChannel -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp -lQt5PlatformSupport */ import "C" diff --git a/webchannel/cgo_darwin_arm64.go b/webchannel/cgo_darwin_arm64.go index 2c66d761..72759494 100755 --- a/webchannel/cgo_darwin_arm64.go +++ b/webchannel/cgo_darwin_arm64.go @@ -8,6 +8,6 @@ package webchannel #cgo CXXFLAGS: -I/usr/local/Qt5.7.0/5.7/ios/include/QtCore -I/usr/local/Qt5.7.0/5.7/ios/include/QtNetwork -I/usr/local/Qt5.7.0/5.7/ios/include/QtQml -I/usr/local/Qt5.7.0/5.7/ios/include/QtWebChannel #cgo LDFLAGS: -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk -miphoneos-version-min=7.0 -arch arm64 -#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5WebChannel -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_server -lqmldbg_tcp -lQt5PlatformSupport +#cgo LDFLAGS: -L/usr/local/Qt5.7.0/5.7/ios/plugins/platforms -lqios -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -L/usr/local/Qt5.7.0/5.7/ios/lib -framework MobileCoreServices -framework CoreFoundation -framework CoreText -framework CoreGraphics -framework OpenGLES -lqtfreetype -framework Security -framework SystemConfiguration -framework CoreBluetooth -L/usr/local/Qt5.7.0/5.7/ios/plugins/imageformats -lqdds -lqicns -lqico -lqtga -lqtiff -lqwbmp -lqwebp -lqtharfbuzzng -lz -lqtpcre -lm -lQt5Core -lQt5Network -lQt5Qml -lQt5WebChannel -lQt5Gui -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets -L/usr/local/Qt5.7.0/5.7/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp -lQt5PlatformSupport */ import "C"