Rename osx folder to darwin_amd64

dontpanic92 · Dec 1, 2016 · 861acae · 861acae
1 parent f6dcc5d
commit 861acae
Show file tree

Hide file tree

Showing 34 changed files with 1,035,905 additions and 1,200,063 deletions.
diff --git a/wx/osx/lib/libwx_baseu-3.1.a → wx/darwin_amd64/lib/libwx_baseu-3.1.a b/wx/osx/lib/libwx_baseu-3.1.a → wx/darwin_amd64/lib/libwx_baseu-3.1.a
diff --git a/wx/osx/lib/libwx_baseu_net-3.1.a → wx/darwin_amd64/lib/libwx_baseu_net-3.1.a b/wx/osx/lib/libwx_baseu_net-3.1.a → wx/darwin_amd64/lib/libwx_baseu_net-3.1.a
diff --git a/wx/osx/lib/libwx_baseu_xml-3.1.a → wx/darwin_amd64/lib/libwx_baseu_xml-3.1.a b/wx/osx/lib/libwx_baseu_xml-3.1.a → wx/darwin_amd64/lib/libwx_baseu_xml-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_adv-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_adv-3.1.a b/wx/osx/lib/libwx_osx_cocoau_adv-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_adv-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_aui-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_aui-3.1.a b/wx/osx/lib/libwx_osx_cocoau_aui-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_aui-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_core-3.1.a → ...win_amd64/lib/libwx_osx_cocoau_core-3.1.a b/wx/osx/lib/libwx_osx_cocoau_core-3.1.a → ...win_amd64/lib/libwx_osx_cocoau_core-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_gl-3.1.a → ...arwin_amd64/lib/libwx_osx_cocoau_gl-3.1.a b/wx/osx/lib/libwx_osx_cocoau_gl-3.1.a → ...arwin_amd64/lib/libwx_osx_cocoau_gl-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_html-3.1.a → ...win_amd64/lib/libwx_osx_cocoau_html-3.1.a b/wx/osx/lib/libwx_osx_cocoau_html-3.1.a → ...win_amd64/lib/libwx_osx_cocoau_html-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_media-3.1.a → ...in_amd64/lib/libwx_osx_cocoau_media-3.1.a b/wx/osx/lib/libwx_osx_cocoau_media-3.1.a → ...in_amd64/lib/libwx_osx_cocoau_media-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_propgrid-3.1.a → ...amd64/lib/libwx_osx_cocoau_propgrid-3.1.a b/wx/osx/lib/libwx_osx_cocoau_propgrid-3.1.a → ...amd64/lib/libwx_osx_cocoau_propgrid-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_qa-3.1.a → ...arwin_amd64/lib/libwx_osx_cocoau_qa-3.1.a b/wx/osx/lib/libwx_osx_cocoau_qa-3.1.a → ...arwin_amd64/lib/libwx_osx_cocoau_qa-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_ribbon-3.1.a → ...n_amd64/lib/libwx_osx_cocoau_ribbon-3.1.a b/wx/osx/lib/libwx_osx_cocoau_ribbon-3.1.a → ...n_amd64/lib/libwx_osx_cocoau_ribbon-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_richtext-3.1.a → ...amd64/lib/libwx_osx_cocoau_richtext-3.1.a b/wx/osx/lib/libwx_osx_cocoau_richtext-3.1.a → ...amd64/lib/libwx_osx_cocoau_richtext-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_stc-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_stc-3.1.a b/wx/osx/lib/libwx_osx_cocoau_stc-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_stc-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_webview-3.1.a → ..._amd64/lib/libwx_osx_cocoau_webview-3.1.a b/wx/osx/lib/libwx_osx_cocoau_webview-3.1.a → ..._amd64/lib/libwx_osx_cocoau_webview-3.1.a
diff --git a/wx/osx/lib/libwx_osx_cocoau_xrc-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_xrc-3.1.a b/wx/osx/lib/libwx_osx_cocoau_xrc-3.1.a → ...rwin_amd64/lib/libwx_osx_cocoau_xrc-3.1.a
diff --git a/wx/osx/lib/libwxjpeg-3.1.a → wx/darwin_amd64/lib/libwxjpeg-3.1.a b/wx/osx/lib/libwxjpeg-3.1.a → wx/darwin_amd64/lib/libwxjpeg-3.1.a
diff --git a/wx/osx/lib/libwxpng-3.1.a → wx/darwin_amd64/lib/libwxpng-3.1.a b/wx/osx/lib/libwxpng-3.1.a → wx/darwin_amd64/lib/libwxpng-3.1.a
diff --git a/wx/osx/lib/libwxregexu-3.1.a → wx/darwin_amd64/lib/libwxregexu-3.1.a b/wx/osx/lib/libwxregexu-3.1.a → wx/darwin_amd64/lib/libwxregexu-3.1.a
diff --git a/wx/osx/lib/libwxscintilla-3.1.a → wx/darwin_amd64/lib/libwxscintilla-3.1.a b/wx/osx/lib/libwxscintilla-3.1.a → wx/darwin_amd64/lib/libwxscintilla-3.1.a
diff --git a/wx/osx/lib/libwxtiff-3.1.a → wx/darwin_amd64/lib/libwxtiff-3.1.a b/wx/osx/lib/libwxtiff-3.1.a → wx/darwin_amd64/lib/libwxtiff-3.1.a
diff --git a/wx/osx/wx/setup.h → wx/darwin_amd64/wx/setup.h b/wx/osx/wx/setup.h → wx/darwin_amd64/wx/setup.h
diff --git a/wx/setup_darwin.go b/wx/setup_darwin.go
diff --git a/wx/setup_darwin_amd64.go b/wx/setup_darwin_amd64.go
@@ -0,0 +1,8 @@
+package wx
+
+// #cgo CPPFLAGS: -I${SRCDIR}/darwin_amd64/ -I${SRCDIR}/../wxWidgets/wxWidgets-3.1.0/include -D_FILE_OFFSET_BITS=64 -D__WXOSX__ -D__WXOSX_COCOA__ -D__WXMAC__ -stdlib=libc++
+// #cgo CXXFLAGS: -std=c++11
+// #cgo !wxgo_binary_package_build LDFLAGS: -L${SRCDIR}/darwin_amd64/lib -lwx_osx_cocoau_xrc-3.1 -lwx_osx_cocoau_webview-3.1 -lwx_osx_cocoau_stc-3.1 -lwx_osx_cocoau_richtext-3.1 -lwx_osx_cocoau_ribbon-3.1 -lwx_osx_cocoau_propgrid-3.1 -lwx_osx_cocoau_aui-3.1 -lwx_osx_cocoau_gl-3.1 -lwx_osx_cocoau_qa-3.1 -lwx_baseu_net-3.1 -lwx_osx_cocoau_html-3.1 -lwx_osx_cocoau_adv-3.1 -lwx_osx_cocoau_core-3.1 -lwx_osx_cocoau_media-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxscintilla-3.1 -lwxregexu-3.1 -lwxtiff-3.1 -lwxjpeg-3.1 -lwxpng-3.1
+// #cgo LDFLAGS: -lc++ -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QTKit  -framework OpenGL -framework AGL -framework WebKit -lexpat  -lz -lpthread -liconv -llzma 
+// #cgo LDFLAGS: -Wl,-S
+import "C"
diff --git a/wx/setup_linux_386.go b/wx/setup_linux_386.go
@@ -1,7 +1,8 @@
 package wx
 
 // #cgo CPPFLAGS: -I${SRCDIR}/linux_386/ -I${SRCDIR}/../wxWidgets/wxWidgets-3.1.0/include -D_FILE_OFFSET_BITS=64 -D__WXGTK__
-// #cgo CXXFLAGS: -std=c++11
-// #cgo LDFLAGS: -L${SRCDIR}/linux_386/lib -pthread -lwx_gtk2u_xrc-3.1 -lwx_gtk2u_stc-3.1 -lwx_gtk2u_richtext-3.1 -lwx_gtk2u_ribbon-3.1 -lwx_gtk2u_propgrid-3.1 -lwx_gtk2u_aui-3.1 -lwx_gtk2u_qa-3.1 -lwx_baseu_net-3.1 -lwx_gtk2u_html-3.1 -lwx_gtk2u_adv-3.1 -lwx_gtk2u_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxscintilla-3.1 -lgthread-2.0 -lX11 -lXxf86vm -lSM -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lpng -ljpeg -ltiff -lexpat -lwxregexu-3.1 -lz -ldl -lm
+// #cgo CXXFLAGS: -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
+// #cgo !wxgo_binary_package_build LDFLAGS: -L${SRCDIR}/linux_386/lib -lwx_gtk3u_xrc-3.1 -lwx_gtk3u_webview-3.1  -lwx_gtk3u_stc-3.1 -lwx_gtk3u_richtext-3.1 -lwx_gtk3u_ribbon-3.1 -lwx_gtk3u_propgrid-3.1 -lwx_gtk3u_aui-3.1 -lwx_gtk3u_media-3.1 -lwx_gtk3u_gl-3.1 -lwx_gtk3u_qa-3.1 -lwx_baseu_net-3.1 -lwx_gtk3u_html-3.1 -lwx_gtk3u_adv-3.1 -lwx_gtk3u_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxscintilla-3.1 -lwxregexu-3.1
+// #cgo LDFLAGS: -pthread -lstdc++ -lGL -lGLU -lgthread-2.0 -lX11 -lXxf86vm -lSM -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lpng -ljpeg -ltiff -lexpat -lz -ldl -lm -lgstreamer-1.0 -lgstvideo-1.0 -lwebkitgtk-3.0
 // #cgo LDFLAGS: -s
 import "C"
diff --git a/wx/setup_linux_amd64.go b/wx/setup_linux_amd64.go
@@ -2,6 +2,7 @@ package wx
 
 // #cgo CPPFLAGS: -I${SRCDIR}/linux_amd64/ -I${SRCDIR}/../wxWidgets/wxWidgets-3.1.0/include -D_FILE_OFFSET_BITS=64 -D__WXGTK__
 // #cgo CXXFLAGS: -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
-// #cgo LDFLAGS: -L${SRCDIR}/linux_amd64/lib -pthread  -lwx_gtk2u_xrc-3.1 -lwx_gtk2u_stc-3.1 -lwx_gtk2u_richtext-3.1 -lwx_gtk2u_ribbon-3.1 -lwx_gtk2u_propgrid-3.1 -lwx_gtk2u_aui-3.1 -lwx_gtk2u_gl-3.1 -lwx_gtk2u_qa-3.1 -lwx_baseu_net-3.1 -lwx_gtk2u_html-3.1 -lwx_gtk2u_adv-3.1 -lwx_gtk2u_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxscintilla-3.1 -lGL -lGLU -lgthread-2.0 -pthread -lX11 -lXxf86vm -lSM -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lpng -ljpeg -ltiff -lexpat -lwxregexu-3.1 -lz -ldl -lm 
+// #cgo !wxgo_binary_package_build LDFLAGS: -L${SRCDIR}/linux_amd64/lib -lwx_gtk3u_xrc-3.1 -lwx_gtk3u_webview-3.1  -lwx_gtk3u_stc-3.1 -lwx_gtk3u_richtext-3.1 -lwx_gtk3u_ribbon-3.1 -lwx_gtk3u_propgrid-3.1 -lwx_gtk3u_aui-3.1 -lwx_gtk3u_media-3.1 -lwx_gtk3u_gl-3.1 -lwx_gtk3u_qa-3.1 -lwx_baseu_net-3.1 -lwx_gtk3u_html-3.1 -lwx_gtk3u_adv-3.1 -lwx_gtk3u_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxscintilla-3.1 -lwxregexu-3.1
+// #cgo LDFLAGS: -pthread -lstdc++ -lGL -lGLU -lgthread-2.0 -lX11 -lXxf86vm -lSM -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lpng -ljpeg -ltiff -lexpat -lz -ldl -lm -lgstreamer-1.0 -lgstvideo-1.0 -lwebkitgtk-3.0
 // #cgo LDFLAGS: -s
 import "C"
diff --git a/wx/setup_windows_386.go b/wx/setup_windows_386.go
@@ -1,6 +1,7 @@
 package wx
 
 // #cgo CPPFLAGS: -I${SRCDIR}/windows_386/ -I${SRCDIR}/../wxWidgets/wxWidgets-3.1.0/include -D_FILE_OFFSET_BITS=64 -D__WXMSW__
-// #cgo LDFLAGS: -L${SRCDIR}/windows_386/lib -Wl,--subsystem,windows -mwindows -lwxmsw31u -lwxmsw31u_gl -lwxscintilla -lopengl32 -lglu32 -lwxregexu -lwxexpat -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32 -lntdll -lmsvcrt
+// #cgo !wxgo_binary_package_build LDFLAGS: -L${SRCDIR}/windows_386/lib -lwxmsw31u -lwxmsw31u_gl -lwxregexu -lwxexpat -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxscintilla
+// #cgo LDFLAGS: -l:libstdc++.a -Wl,--subsystem,windows -mwindows -lopengl32 -lglu32 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32 -lntdll -lmsvcrt
 // #cgo CXXFLAGS: -fpermissive
 import "C"