From b9c3e87d5df7ec94e9bbdd8a29822d7fdca67d8c Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 29 May 2016 22:48:55 -0400 Subject: More static library linker setup. --- link_darwin_amd64.go | 1 - link_linux_386.go | 14 ++++++++++++++ link_linux_amd64.go | 14 ++++++++++++++ link_unix.go | 13 ------------- 4 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 link_linux_386.go create mode 100644 link_linux_amd64.go delete mode 100644 link_unix.go 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 // #include // extern void _CFRunLoopSetCurrent(CFRunLoopRef); diff --git a/link_linux_386.go b/link_linux_386.go new file mode 100644 index 0000000..0a8c1d8 --- /dev/null +++ b/link_linux_386.go @@ -0,0 +1,14 @@ +// +build !windows +// +build !darwin + +// 11 december 2015 + +package ui + +// #cgo LDFLAGS: ${SRCDIR}/libui_linux_386.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 +} 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 +} diff --git a/link_unix.go b/link_unix.go deleted file mode 100644 index e06cb12..0000000 --- a/link_unix.go +++ /dev/null @@ -1,13 +0,0 @@ -// +build !windows -// +build !darwin - -// 11 december 2015 - -package ui - -// #cgo LDFLAGS: -L${SRCDIR} -lui -Wl,-rpath=$ORIGIN -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 -} -- cgit v1.2.3