diff options
| -rw-r--r-- | link_darwin_amd64.go | 1 | ||||
| -rw-r--r-- | link_linux_386.go (renamed from link_unix.go) | 3 | ||||
| -rw-r--r-- | link_linux_amd64.go | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/link_darwin_amd64.go b/link_darwin_amd64.go index 64221b0..eee19e2 100644 --- a/link_darwin_amd64.go +++ b/link_darwin_amd64.go @@ -3,7 +3,6 @@ package ui // #cgo LDFLAGS: ${SRCDIR}/libui_darwin_amd64.a -framework Foundation -framework AppKit -lpthread -// /* (thanks to http://jorgen.tjer.no/post/2014/05/20/dt-rpath-ld-and-at-rpath-dyld/ for the @executable_path clarifiaction) */ // #include <CoreFoundation/CoreFoundation.h> // #include <pthread.h> // extern void _CFRunLoopSetCurrent(CFRunLoopRef); diff --git a/link_unix.go b/link_linux_386.go index e06cb12..0a8c1d8 100644 --- a/link_unix.go +++ b/link_linux_386.go @@ -5,7 +5,8 @@ package ui -// #cgo LDFLAGS: -L${SRCDIR} -lui -Wl,-rpath=$ORIGIN +// #cgo LDFLAGS: ${SRCDIR}/libui_linux_386.a -Wl,-rpath=$ORIGIN +// #cgo pkg-config: gtk+-3.0 import "C" func ensureMainThread() { diff --git a/link_linux_amd64.go b/link_linux_amd64.go new file mode 100644 index 0000000..8cb2029 --- /dev/null +++ b/link_linux_amd64.go @@ -0,0 +1,14 @@ +// +build !windows +// +build !darwin + +// 11 december 2015 + +package ui + +// #cgo LDFLAGS: ${SRCDIR}/libui_linux_amd64.a -Wl,-rpath=$ORIGIN +// #cgo pkg-config: gtk+-3.0 +import "C" + +func ensureMainThread() { + // do nothing; GTK+ doesn't care which thread we're on so long as we don't change it after starting +} |