Finally found a way to correctly build on BSD, so remove BSD specific
Makefile.
This commit is contained in:
parent
b2eea597bd
commit
2e45392f68
46
Makefile
46
Makefile
@ -7,9 +7,51 @@
|
|||||||
|
|
||||||
# goosList = "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows"
|
# goosList = "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows"
|
||||||
# goarchList = "386 amd64 amd64p32 arm arm64 ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32leppc s390 s390x sparc sparc64"
|
# goarchList = "386 amd64 amd64p32 arm arm64 ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32leppc s390 s390x sparc sparc64"
|
||||||
include make/Makefile.common
|
|
||||||
|
|
||||||
# Windows needs the .exe extension.
|
# Windows needs the .exe extension.
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
EXT=.exe
|
EXT=.exe
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
TAGS=
|
||||||
|
|
||||||
|
.PHONY: fmt vet get clean dev setdev test ServerMovieNight
|
||||||
|
|
||||||
|
all: fmt vet test MovieNight static/main.wasm settings.json
|
||||||
|
|
||||||
|
server: ServerMovieNight static/main.wasm
|
||||||
|
|
||||||
|
ServerMovieNight: *.go common/*.go
|
||||||
|
GOOS=${TARGET} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight $(TAGS)
|
||||||
|
|
||||||
|
setdev:
|
||||||
|
$(eval export TAGS=-tags "dev")
|
||||||
|
|
||||||
|
dev: setdev all
|
||||||
|
|
||||||
|
MovieNight: *.go common/*.go
|
||||||
|
GOOS=${TARGET} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight${EXT} $(TAGS)
|
||||||
|
|
||||||
|
static/js/wasm_exec.js:
|
||||||
|
cp $$(go$(GO_VERSION) env GOROOT)/misc/wasm/wasm_exec.js $@
|
||||||
|
|
||||||
|
static/main.wasm: static/js/wasm_exec.js wasm/*.go common/*.go
|
||||||
|
GOOS=js GOARCH=wasm go$(GO_VERSION) build -o $@ $(TAGS) wasm/*.go
|
||||||
|
|
||||||
|
clean:
|
||||||
|
-rm MovieNight${EXT} ./static/main.wasm ./static/js/wasm_exec.js
|
||||||
|
|
||||||
|
fmt:
|
||||||
|
gofmt -w .
|
||||||
|
|
||||||
|
vet:
|
||||||
|
go$(GO_VERSION) vet $(TAGS) ./...
|
||||||
|
GOOS=js GOARCH=wasm go$(GO_VERSION) vet $(TAGS) ./...
|
||||||
|
|
||||||
|
test:
|
||||||
|
go$(GO_VERSION) test $(TAGS) ./...
|
||||||
|
|
||||||
|
# Do not put settings_example.json here as a prereq to avoid overwriting
|
||||||
|
# the settings if the example is updated.
|
||||||
|
settings.json:
|
||||||
|
cp settings_example.json settings.json
|
||||||
|
12
Makefile.BSD
12
Makefile.BSD
@ -1,12 +0,0 @@
|
|||||||
# If a different version of Go is installed (via `go get`) set the GO_VERSION
|
|
||||||
# environment variable to that version. For example, setting it to "1.13.7"
|
|
||||||
# will run `go1.13.7 build [...]` instead of `go build [...]`.
|
|
||||||
#
|
|
||||||
# For info on installing extra versions, see this page:
|
|
||||||
# https://golang.org/doc/install#extra_versions
|
|
||||||
|
|
||||||
# goosList = "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows"
|
|
||||||
# goarchList = "386 amd64 amd64p32 arm arm64 ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32leppc s390 s390x sparc sparc64"
|
|
||||||
include make/Makefile.common
|
|
||||||
|
|
||||||
GOOS=freebsd
|
|
@ -1,42 +0,0 @@
|
|||||||
TAGS=
|
|
||||||
|
|
||||||
.PHONY: fmt vet get clean dev setdev test ServerMovieNight
|
|
||||||
|
|
||||||
all: fmt vet test MovieNight static/main.wasm settings.json
|
|
||||||
|
|
||||||
server: ServerMovieNight static/main.wasm
|
|
||||||
|
|
||||||
ServerMovieNight: *.go common/*.go
|
|
||||||
GOOS=${TARGET} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight $(TAGS)
|
|
||||||
|
|
||||||
setdev:
|
|
||||||
$(eval export TAGS=-tags "dev")
|
|
||||||
|
|
||||||
dev: setdev all
|
|
||||||
|
|
||||||
MovieNight: *.go common/*.go
|
|
||||||
GOOS=${TARGET} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight${EXT} $(TAGS)
|
|
||||||
|
|
||||||
static/js/wasm_exec.js:
|
|
||||||
cp $$(go$(GO_VERSION) env GOROOT)/misc/wasm/wasm_exec.js $@
|
|
||||||
|
|
||||||
static/main.wasm: static/js/wasm_exec.js wasm/*.go common/*.go
|
|
||||||
GOOS=js GOARCH=wasm go$(GO_VERSION) build -o $@ $(TAGS) wasm/*.go
|
|
||||||
|
|
||||||
clean:
|
|
||||||
-rm MovieNight${EXT} ./static/main.wasm ./static/js/wasm_exec.js
|
|
||||||
|
|
||||||
fmt:
|
|
||||||
gofmt -w .
|
|
||||||
|
|
||||||
vet:
|
|
||||||
go$(GO_VERSION) vet $(TAGS) ./...
|
|
||||||
GOOS=js GOARCH=wasm go$(GO_VERSION) vet $(TAGS) ./...
|
|
||||||
|
|
||||||
test:
|
|
||||||
go$(GO_VERSION) test $(TAGS) ./...
|
|
||||||
|
|
||||||
# Do not put settings_example.json here as a prereq to avoid overwriting
|
|
||||||
# the settings if the example is updated.
|
|
||||||
settings.json:
|
|
||||||
cp settings_example.json settings.json
|
|
@ -38,14 +38,14 @@ You have to :
|
|||||||
- download `git clone https://github.com/zorchenhimer/MovieNight`, go into the source directory `cd MovieNight`;
|
- download `git clone https://github.com/zorchenhimer/MovieNight`, go into the source directory `cd MovieNight`;
|
||||||
- choose your `TARGET` oneof "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows";
|
- choose your `TARGET` oneof "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows";
|
||||||
- choose your `ARCH` oneof "386 amd64 amd64p32 arm arm64 ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32leppc s390 s390x sparc sparc64";
|
- choose your `ARCH` oneof "386 amd64 amd64p32 arm arm64 ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32leppc s390 s390x sparc sparc64";
|
||||||
- build `make TARGET=windows ARCH=386`;
|
- build `make TARGET=windows ARCH=386` (On BSD systems use `gmake`);
|
||||||
- and run `./MovieNight`;
|
- and run `./MovieNight`;
|
||||||
|
|
||||||
Example :
|
Example :
|
||||||
```bash
|
```bash
|
||||||
$ git clone https://github.com/zorchenhimer/MovieNight
|
$ git clone https://github.com/zorchenhimer/MovieNight
|
||||||
$ cd MovieNight
|
$ cd MovieNight
|
||||||
$ make TARGET=windows ARCH=386
|
$ (make|gmake) TARGET=windows ARCH=386
|
||||||
$ ./MovieNight
|
$ ./MovieNight
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user