Added conditional LDFLAGS to support windows x86

2019-10-16 23:20:48 -05:00 · 2019-10-16 23:20:48 -05:00 · ed7c05e2e8
parent 94ae30ecdb
commit ed7c05e2e8
21 changed files with 20 additions and 4 deletions
--- a/ultralight/cgo_helpers.go
+++ b/ultralight/cgo_helpers.go
@ -7,7 +7,11 @@ package ultralight

 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"
--- a/ultralight/const.go
+++ b/ultralight/const.go
@ -7,7 +7,11 @@ package ultralight

 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"
--- a/ultralight/libs/Ultralight.dll
+++ b/ultralight/libs/Ultralight.dll
--- a/ultralight/libs/darwin/x64/libAppCore.dylib
+++ b/ultralight/libs/darwin/x64/libAppCore.dylib
--- a/ultralight/libs/darwin/x64/libUltralight.dylib
+++ b/ultralight/libs/darwin/x64/libUltralight.dylib
--- a/ultralight/libs/darwin/x64/libUltralightCore.dylib
+++ b/ultralight/libs/darwin/x64/libUltralightCore.dylib
--- a/ultralight/libs/darwin/x64/libWebCore.dylib
+++ b/ultralight/libs/darwin/x64/libWebCore.dylib
--- a/ultralight/libs/linux/x64/libAppCore.so
+++ b/ultralight/libs/linux/x64/libAppCore.so
--- a/ultralight/libs/linux/x64/libUltralight.so
+++ b/ultralight/libs/linux/x64/libUltralight.so
--- a/ultralight/libs/linux/x64/libUltralightCore.so
+++ b/ultralight/libs/linux/x64/libUltralightCore.so
--- a/ultralight/libs/linux/x64/libWebCore.so
+++ b/ultralight/libs/linux/x64/libWebCore.so
--- a/ultralight/libs/windows/x32/AppCore.dll
+++ b/ultralight/libs/windows/x32/AppCore.dll
--- a/ultralight/libs/windows/x32/Ultralight.dll
+++ b/ultralight/libs/windows/x32/Ultralight.dll
--- a/ultralight/libs/windows/x32/UltralightCore.dll
+++ b/ultralight/libs/windows/x32/UltralightCore.dll
--- a/ultralight/libs/windows/x32/WebCore.dll
+++ b/ultralight/libs/windows/x32/WebCore.dll
--- a/ultralight/libs/windows/x64/AppCore.dll
+++ b/ultralight/libs/windows/x64/AppCore.dll
--- a/ultralight/libs/windows/x64/Ultralight.dll
+++ b/ultralight/libs/windows/x64/Ultralight.dll
--- a/ultralight/libs/windows/x64/UltralightCore.dll
+++ b/ultralight/libs/windows/x64/UltralightCore.dll
--- a/ultralight/libs/windows/x64/WebCore.dll
+++ b/ultralight/libs/windows/x64/WebCore.dll
--- a/ultralight/types.go
+++ b/ultralight/types.go
@ -7,7 +7,11 @@ package ultralight

 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"
--- a/ultralight/ultralight.go
+++ b/ultralight/ultralight.go
@ -7,7 +7,11 @@ package ultralight

 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"