Recompile windows amd64 lib to fix #38

dontpanic92 · Nov 5, 2017 · b7e4132 · b7e4132
1 parent c4db2b9
commit b7e4132
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 1,702 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wx/windows_amd64"]
+	path = wx/windows_amd64
+	url = https://github.com/wx-libs/wx3.1-windows-amd64
diff --git a/wx/setup_windows_amd64.go b/wx/setup_windows_amd64.go
@@ -5,5 +5,5 @@ package wx
 // #cgo mingw_workaround LDFLAGS: -Wl,--subsystem,windows,--allow-multiple-definition
 // #cgo !mingw_workaround LDFLAGS: -Wl,--subsystem,windows
 // #cgo LDFLAGS: -l:libstdc++.a -mwindows -lopengl32 -lglu32 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32 -lntdll -lmsvcrt
-// #cgo CXXFLAGS: -fpermissive
+// #cgo CXXFLAGS: -fpermissive -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
 import "C"
diff --git a/wx/windows_amd64/lib/libwxexpat.a b/wx/windows_amd64/lib/libwxexpat.a
diff --git a/wx/windows_amd64/lib/libwxjpeg.a b/wx/windows_amd64/lib/libwxjpeg.a
diff --git a/wx/windows_amd64/lib/libwxmsw31u.a b/wx/windows_amd64/lib/libwxmsw31u.a
diff --git a/wx/windows_amd64/lib/libwxmsw31u_gl.a b/wx/windows_amd64/lib/libwxmsw31u_gl.a
diff --git a/wx/windows_amd64/lib/libwxpng.a b/wx/windows_amd64/lib/libwxpng.a
diff --git a/wx/windows_amd64/lib/libwxregexu.a b/wx/windows_amd64/lib/libwxregexu.a
diff --git a/wx/windows_amd64/lib/libwxscintilla.a b/wx/windows_amd64/lib/libwxscintilla.a
diff --git a/wx/windows_amd64/lib/libwxtiff.a b/wx/windows_amd64/lib/libwxtiff.a
diff --git a/wx/windows_amd64/lib/libwxzlib.a b/wx/windows_amd64/lib/libwxzlib.a
diff --git a/wx/windows_amd64/wx/msw/rcdefs.h b/wx/windows_amd64/wx/msw/rcdefs.h