Merge pull request #148 from Raz-Hemo/windows-cross-fix

fix windows cross compiling
This commit is contained in:
Nick 2021-01-10 12:15:02 -05:00 committed by GitHub
commit 58bd6e8a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

4
make/Makefile.common Normal file → Executable file
View File

@ -7,7 +7,7 @@ all: fmt vet test MovieNight static/main.wasm settings.json
server: ServerMovieNight static/main.wasm
ServerMovieNight: *.go common/*.go
GOOS=${GOOS} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight $(TAGS)
GOOS=${TARGET} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight $(TAGS)
setdev:
$(eval export TAGS=-tags "dev")
@ -15,7 +15,7 @@ setdev:
dev: setdev all
MovieNight: *.go common/*.go
GOOS=${GOOS} GOARCH=${ARCH} go$(GO_VERSION) build -o MovieNight${EXT} $(TAGS)
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 $@