interesting
/
muon
mirror of https://github.com/ImVexed/muon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from ImVexed/fix-x86compile 

Added conditional LDFLAGS to support windows x86
This commit is contained in:
V-X 2019-10-16 23:32:57 -05:00 committed by GitHub
parent 467d82e243 ed7c05e2e8
commit ae2a6637f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ultralight/cgo_helpers.go
View File

@ -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"

6
ultralight/const.go
View File

@ -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"

BIN
ultralight/libs/Ultralight.dll
View File

Binary file not shown.

0
ultralight/libs/libAppCore.dylib → ultralight/libs/darwin/x64/libAppCore.dylib
View File

0
ultralight/libs/libUltralight.dylib → ultralight/libs/darwin/x64/libUltralight.dylib
View File

0
ultralight/libs/libUltralightCore.dylib → ultralight/libs/darwin/x64/libUltralightCore.dylib
View File

0
ultralight/libs/libWebCore.dylib → ultralight/libs/darwin/x64/libWebCore.dylib
View File

0
ultralight/libs/libAppCore.so → ultralight/libs/linux/x64/libAppCore.so
View File

0
ultralight/libs/libUltralight.so → ultralight/libs/linux/x64/libUltralight.so
View File

0
ultralight/libs/libUltralightCore.so → ultralight/libs/linux/x64/libUltralightCore.so
View File

0
ultralight/libs/libWebCore.so → ultralight/libs/linux/x64/libWebCore.so
View File

BIN
ultralight/libs/windows/x32/AppCore.dll Normal file
View File

Binary file not shown.

BIN
ultralight/libs/windows/x32/Ultralight.dll Normal file
View File

Binary file not shown.

BIN
ultralight/libs/windows/x32/UltralightCore.dll Normal file
View File

Binary file not shown.

BIN
ultralight/libs/windows/x32/WebCore.dll Normal file
View File

Binary file not shown.

BIN
ultralight/libs/AppCore.dll → ultralight/libs/windows/x64/AppCore.dll
View File

Binary file not shown.

BIN
ultralight/libs/windows/x64/Ultralight.dll Normal file
View File

Binary file not shown.

BIN
ultralight/libs/UltralightCore.dll → ultralight/libs/windows/x64/UltralightCore.dll
View File

Binary file not shown.

0
ultralight/libs/WebCore.dll → ultralight/libs/windows/x64/WebCore.dll
View File

6
ultralight/types.go
View File

@ -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"

6
ultralight/ultralight.go
View File

@ -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"