summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2018-08-11 16:12:54 -0400
committerPietro Gagliardi <[email protected]>2018-08-11 16:12:54 -0400
commit0f75ebb5fa7a12bd1df26622ed3f5544a9d1d32b (patch)
tree8668b188572b47e064b173b42fdf04061643dd51
parentdc108a5d4dc79fa680fdad596e0b96dab3257895 (diff)
First step toward alpha 4: we no longer need the Windows resource trick.
-rw-r--r--libui_windows_386.res.obin1952 -> 0 bytes
-rw-r--r--libui_windows_amd64.res.obin1952 -> 0 bytes
-rw-r--r--link_windows_386.go2
-rw-r--r--link_windows_amd64.go2
-rw-r--r--main.go1
-rw-r--r--static.rc3
-rw-r--r--static_windows_386.sysobin1308 -> 0 bytes
-rw-r--r--static_windows_amd64.sysobin1308 -> 0 bytes
8 files changed, 3 insertions, 5 deletions
diff --git a/libui_windows_386.res.o b/libui_windows_386.res.o
deleted file mode 100644
index 4b03f64..0000000
--- a/libui_windows_386.res.o
+++ /dev/null
Binary files differ
diff --git a/libui_windows_amd64.res.o b/libui_windows_amd64.res.o
deleted file mode 100644
index ddcddbf..0000000
--- a/libui_windows_amd64.res.o
+++ /dev/null
Binary files differ
diff --git a/link_windows_386.go b/link_windows_386.go
index 776b481..d617a20 100644
--- a/link_windows_386.go
+++ b/link_windows_386.go
@@ -2,7 +2,7 @@
package ui
-// #cgo LDFLAGS: ${SRCDIR}/libui_windows_386.a ${SRCDIR}/libui_windows_386.res.o
+// #cgo LDFLAGS: ${SRCDIR}/libui_windows_386.a
// /* note the order; also note the lack of uuid */
// #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -static -static-libgcc -static-libstdc++
import "C"
diff --git a/link_windows_amd64.go b/link_windows_amd64.go
index ad2d1a2..73c94af 100644
--- a/link_windows_amd64.go
+++ b/link_windows_amd64.go
@@ -2,7 +2,7 @@
package ui
-// #cgo LDFLAGS: ${SRCDIR}/libui_windows_amd64.a ${SRCDIR}/libui_windows_amd64.res.o
+// #cgo LDFLAGS: ${SRCDIR}/libui_windows_amd64.a
// /* note the order; also note the lack of uuid */
// #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -static -static-libgcc -static-libstdc++
import "C"
diff --git a/main.go b/main.go
index b908e0a..dd1443a 100644
--- a/main.go
+++ b/main.go
@@ -27,6 +27,7 @@ import "C"
// make sure main() runs on the first thread created by the OS
// if main() calls Main(), things will just work on macOS, where the first thread created by the OS is the only thread allowed to be the main GUI thread
// we might as well lock the OS thread for the other platforms here too (though on those it doesn't matter *which* thread we lock to)
+// TODO describe the source of this trick
func init() {
runtime.LockOSThread()
}
diff --git a/static.rc b/static.rc
deleted file mode 100644
index ca23375..0000000
--- a/static.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* 5 june 2016 */
-#pragma code_page(65001)
-1 24 "static.manifest"
diff --git a/static_windows_386.syso b/static_windows_386.syso
deleted file mode 100644
index 46c6ccc..0000000
--- a/static_windows_386.syso
+++ /dev/null
Binary files differ
diff --git a/static_windows_amd64.syso b/static_windows_amd64.syso
deleted file mode 100644
index eb56b3b..0000000
--- a/static_windows_amd64.syso
+++ /dev/null
Binary files differ