summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2016-05-30 02:06:25 -0400
committerPietro Gagliardi <[email protected]>2016-05-30 02:06:25 -0400
commit80e7d83b77785aacc671f2327ccf135b6bcb0f09 (patch)
tree55ef554c39323704f8533d8d2bdd3a5b48a22622
parent52f7d276a6bb04b8827ac019ad1e135b43819cea (diff)
This isn't going to work.
-rw-r--r--libui_windows_amd64.resbin1780 -> 0 bytes
-rw-r--r--libui_windows_amd64.res.obin0 -> 1952 bytes
-rw-r--r--link_windows.go10
-rw-r--r--link_windows_amd64.go12
4 files changed, 12 insertions, 10 deletions
diff --git a/libui_windows_amd64.res b/libui_windows_amd64.res
deleted file mode 100644
index 3198d2d..0000000
--- a/libui_windows_amd64.res
+++ /dev/null
Binary files differ
diff --git a/libui_windows_amd64.res.o b/libui_windows_amd64.res.o
new file mode 100644
index 0000000..0ba56f5
--- /dev/null
+++ b/libui_windows_amd64.res.o
Binary files differ
diff --git a/link_windows.go b/link_windows.go
deleted file mode 100644
index 279d3a2..0000000
--- a/link_windows.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// 13 december 2015
-
-package ui
-
-// #cgo LDFLAGS: -L${SRCDIR} -lui
-import "C"
-
-func ensureMainThread() {
- // do nothing; Windows doesn't care which thread we're on so long as we don't change it after starting
-}
diff --git a/link_windows_amd64.go b/link_windows_amd64.go
new file mode 100644
index 0000000..7a9c08d
--- /dev/null
+++ b/link_windows_amd64.go
@@ -0,0 +1,12 @@
+// 13 december 2015
+
+package ui
+
+// #cgo LDFLAGS: ${SRCDIR}/libui_windows_amd64.lib ${SRCDIR}/libui_windows_amd64.res.o
+// /* note the order; also note the lack of uuid */
+// #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -lmsvcrt
+import "C"
+
+func ensureMainThread() {
+ // do nothing; Windows doesn't care which thread we're on so long as we don't change it after starting
+}