Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vendoring issues of v3.2 #284

Merged
merged 2 commits into from
Nov 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions v3.2/glfw/build_cgo_hack.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// +build required

package glfw

// This file exists purely to prevent the golang toolchain from stripping
// away the c source directories and files when `go mod vendor` is used
// to populate a `vendor/` directory of a project depending on `go-gl/glfw`.
//
// How it works:
// - every directory which only includes c source files receives a dummy.go file.
// - every directory we want to preserve is included here as a _ import.
// - this file is given a build to exclude it from the regular build.
import (
// Prevent go tooling from stripping out the c source files.
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/deps"
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/include/GLFW"
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/src"
)
4 changes: 4 additions & 0 deletions v3.2/glfw/glfw/deps/KHR/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy
12 changes: 12 additions & 0 deletions v3.2/glfw/glfw/deps/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy

import (
// Prevent go tooling from stripping out the c source files.
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/deps/KHR"
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/deps/glad"
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/deps/mingw"
_ "github.com/go-gl/glfw/v3.2/glfw/glfw/deps/vulkan"
)
4 changes: 4 additions & 0 deletions v3.2/glfw/glfw/deps/glad/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy
4 changes: 4 additions & 0 deletions v3.2/glfw/glfw/deps/mingw/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy
4 changes: 4 additions & 0 deletions v3.2/glfw/glfw/deps/vulkan/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy
4 changes: 4 additions & 0 deletions v3.2/glfw/glfw/include/GLFW/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy
4 changes: 4 additions & 0 deletions v3.2/glfw/glfw/src/dummy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// +build required

// Package dummy prevents go tooling from stripping the c dependencies.
package dummy