Merge pull request #2 from hallum/amd64_linux_buildfix

AllenDang · web-flow · commit db86535288a0 · 2022-08-27T13:15:18.000+08:00
Add additional libraries to backend.go cgo statements for amd64,linux…
diff --git a/backend.go b/backend.go
@@ -1,6 +1,6 @@
 package cimgui
 
-// #cgo amd64,linux LDFLAGS: ${SRCDIR}/lib/linux/x64/libglfw3.a
+// #cgo amd64,linux LDFLAGS: ${SRCDIR}/lib/linux/x64/libglfw3.a -ldl -lGL -lX11
 // #cgo amd64,windows LDFLAGS: -L${SRCDIR}/lib/windows/x64 -l:libglfw3.a -lgdi32 -lopengl32 -limm32
 // #cgo darwin LDFLAGS: -framework Cocoa -framework IOKit -framework CoreVideo
 // #cgo amd64,darwin LDFLAGS: ${SRCDIR}/lib/macos/x64/libglfw3.a
diff --git a/extra_types.go b/extra_types.go
@@ -46,16 +46,16 @@ func (vec *ImVec2) wrap() (out *C.ImVec2, finisher func()) {
 type ImVec4 struct {
 	X float32
 	Y float32
-	W float32
 	Z float32
+	W float32
 }
 
 func NewImVec4(r, g, b, a float32) ImVec4 {
 	return ImVec4{
 		X: r,
 		Y: g,
-		W: b,
-		Z: a,
+		Z: b,
+		W: a,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,16 +46,16 @@ func (vec ImVec2) wrap() (out C.ImVec2, finisher func()) {`
`46`	`46`	`type ImVec4 struct {`
`47`	`47`	`X float32`
`48`	`48`	`Y float32`
`49`		`- W float32`
`50`	`49`	`Z float32`
	`50`	`+ W float32`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func NewImVec4(r, g, b, a float32) ImVec4 {`
`54`	`54`	`return ImVec4{`
`55`	`55`	`X: r,`
`56`	`56`	`Y: g,`
`57`		`- W: b,`
`58`		`- Z: a,`
	`57`	`+ Z: b,`
	`58`	`+ W: a,`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`