First step toward alpha 4: we no longer need the Windows resource trick.
This commit is contained in:
parent
dc108a5d4d
commit
0f75ebb5fa
Binary file not shown.
Binary file not shown.
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
package ui
|
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 */
|
// /* 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++
|
// #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -static -static-libgcc -static-libstdc++
|
||||||
import "C"
|
import "C"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
package ui
|
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 */
|
// /* 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++
|
// #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -static -static-libgcc -static-libstdc++
|
||||||
import "C"
|
import "C"
|
||||||
|
|
1
main.go
1
main.go
|
@ -27,6 +27,7 @@ import "C"
|
||||||
// make sure main() runs on the first thread created by the OS
|
// 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
|
// 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)
|
// 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() {
|
func init() {
|
||||||
runtime.LockOSThread()
|
runtime.LockOSThread()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
/* 5 june 2016 */
|
|
||||||
#pragma code_page(65001)
|
|
||||||
1 24 "static.manifest"
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue