mirror of
https://github.com/DarkPlacesEngine/gmqcc.git
synced 2025-01-19 06:40:49 +00:00
Fixed Windows builds. Now we also build Win64 packages.
This commit is contained in:
parent
7ffda37513
commit
8c0a280a3e
4 changed files with 32 additions and 4 deletions
4
Makefile
4
Makefile
|
@ -1,8 +1,8 @@
|
|||
include include.mk
|
||||
|
||||
UNAME ?= $(shell uname)
|
||||
CYGWIN = $(findstring CYGWIN, $(UNAME))
|
||||
MINGW = $(findstring MINGW32, $(UNAME))
|
||||
CYGWIN = $(findstring CYGWIN, $(UNAME))
|
||||
MINGW = $(findstring MINGW, $(UNAME))
|
||||
|
||||
CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes
|
||||
#turn on tons of warnings if clang is present
|
||||
|
|
|
@ -10,16 +10,22 @@ endif
|
|||
.NOTPARALLEL: upload
|
||||
|
||||
base:
|
||||
@echo "Building Debian packages ..."
|
||||
$(MAKE) -C deb/
|
||||
$(MAKE) -C deb/ CARCH=i686
|
||||
@echo "Building Archlinux packages ..."
|
||||
$(MAKE) -C archlinux/this/
|
||||
$(MAKE) -C archlinux/this/ CARCH=i686
|
||||
@echo "Building Slackware packages ..."
|
||||
$(MAKE) -C win32/
|
||||
$(MAKE) -C win64
|
||||
@echo "Building Windows packages ..."
|
||||
$(MAKE) -C slackware/this/
|
||||
$(MAKE) -C slackware/this/ CARCH=i686
|
||||
@mv deb/*.deb ./
|
||||
@mv archlinux/this/*pkg.tar.xz ./
|
||||
@mv win32/*.zip ./
|
||||
@mv win64/*.zip ./
|
||||
@mv slackware/this/*.txz ./
|
||||
|
||||
upload:
|
||||
|
|
|
@ -6,8 +6,8 @@ PATCH := `sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER)`
|
|||
BINDIR := gmqcc-$(MAJOR).$(MINOR).$(PATCH)
|
||||
|
||||
base:
|
||||
$(MAKE) CC=i486-mingw32-gcc UNAME=MINGW32 -C $(BASEDIR) clean
|
||||
$(MAKE) CC=i486-mingw32-gcc UNAME=MINGW32 -C $(BASEDIR) DESTDIR=distro/win32/$(BINDIR) PREFIX=/ strip install
|
||||
$(MAKE) CC=i686-w64-mingw32-gcc UNAME=MINGW -C $(BASEDIR) clean
|
||||
$(MAKE) CC=i686-w64-mingw32-gcc UNAME=MINGW -C $(BASEDIR) DESTDIR=distro/win32/$(BINDIR) PREFIX=/ strip install
|
||||
@mkdir -p $(BINDIR)/doc
|
||||
@groff -mandoc $(BINDIR)/man1/gmqpak.1 | ps2pdf - $(BINDIR)/doc/gmqpak.pdf
|
||||
@groff -mandoc $(BINDIR)/man1/qcvm.1 | ps2pdf - $(BINDIR)/doc/qcvm.pdf
|
||||
|
|
22
distro/win64/Makefile
Normal file
22
distro/win64/Makefile
Normal file
|
@ -0,0 +1,22 @@
|
|||
BASEDIR := ../..
|
||||
HEADER := $(BASEDIR)/gmqcc.h
|
||||
MAJOR := `sed -n -e '/GMQCC_VERSION_MAJOR/{s/.* .* //;p;q;}' $(HEADER)`
|
||||
MINOR := `sed -n -e '/GMQCC_VERSION_MINOR/{s/.* .* //;p;q;}' $(HEADER)`
|
||||
PATCH := `sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER)`
|
||||
BINDIR := gmqcc-$(MAJOR).$(MINOR).$(PATCH)
|
||||
|
||||
base:
|
||||
$(MAKE) CC=x86_64-w64-mingw32-gcc UNAME=MINGW -C $(BASEDIR) clean
|
||||
$(MAKE) CC=x86_64-w64-mingw32-gcc UNAME=MINGW -C $(BASEDIR) DESTDIR=distro/win64/$(BINDIR) PREFIX=/ strip install
|
||||
@mkdir -p $(BINDIR)/doc
|
||||
@groff -mandoc $(BINDIR)/man1/gmqpak.1 | ps2pdf - $(BINDIR)/doc/gmqpak.pdf
|
||||
@groff -mandoc $(BINDIR)/man1/qcvm.1 | ps2pdf - $(BINDIR)/doc/qcvm.pdf
|
||||
@groff -mandoc $(BINDIR)/man1/gmqcc.1 | ps2pdf - $(BINDIR)/doc/gmqcc.pdf
|
||||
@rm -rf $(BINDIR)/man1/
|
||||
@zip -r $(BINDIR)-win64.zip $(BINDIR)
|
||||
@rm -rf $(BINDIR)
|
||||
clean:
|
||||
$(MAKE) -C $(BASEDIR) clean
|
||||
@rm -f *.zip
|
||||
|
||||
all: base
|
Loading…
Reference in a new issue