Removed Windows and Mac builds. Too buggy in cross compile.

This commit is contained in:
Steve 2019-06-02 17:32:26 +01:00
parent 1093c16ed0
commit e8a8e87666
6 changed files with 9 additions and 125 deletions

9
build/build.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
cd ..
rm -rf dist
make clean
make
make dist
make src-dist

View File

@ -1,11 +0,0 @@
#!/bin/bash -e
VERSION=`egrep 'VERSION = ([0-9.+])' ../common.mk | awk '{print $3}'`
REVISION=`egrep 'REVISION = ([0-9.+])' ../common.mk | awk '{print $3}'`
mkdir -p ../dist
rm -rf ../dist/*
linux/build.sh $VERSION $REVISION
win32/build.sh $VERSION $REVISION

View File

@ -1,19 +0,0 @@
#!/bin/bash -e
cd `dirname $0`
BUILDROOT="build/linux"
cd ../..
VERSION=$1
REVISION=$2
make clean
make src-dist
make clean
make LOCALE_DIR=locale
make dist
rm -rf blobwarsAttrition

View File

@ -1,39 +0,0 @@
#!/bin/bash -e
cd `dirname $0`
BUILDROOT="build/win32"
cd ../..
VERSION=$1
REVISION=$2
FOLDER="blobwarsAttrition-$1.$2"
OUT="$BUILDROOT/$FOLDER"
make -f makefile.win32 clean
make -f makefile.win32
mkdir -p $OUT
rm -rf $OUT/*
cp blobwarsAttrition.exe $OUT
cp -rL data $OUT
cp -rL gfx $OUT
cp -rL music $OUT
cp -rL sound $OUT
cp -rL manual $OUT
cp -rL locale $OUT
cp LICENSE $OUT
cp README.md $OUT
cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT
cd $BUILDROOT
zip -r blobwarsAttrition-${VERSION}.${REVISION}.win32.zip $FOLDER
mv *.zip ../../dist
rm -rf $FOLDER

View File

@ -1,35 +0,0 @@
PROG = blobwarsAttrition
CC = gcc
PREFIX ?= /usr
BIN_DIR ?= $(PREFIX)/bin
DATA_DIR ?= /opt/$(PROG)
LOCALE_DIR = $(PREFIX)/share/locale
ICON_DIR = $(PREFIX)/share/icons/hicolor
DESKTOP_DIR = $(PREFIX)/share/applications
DESTDIR ?=
INST_BIN_DIR = $(DESTDIR)$(BIN_DIR)
INST_DATA_DIR = $(DESTDIR)$(DATA_DIR)
INST_LOCALE_DIR = $(DESTDIR)$(LOCALE_DIR)
INST_ICON_DIR = $(DESTDIR)$(ICON_DIR)
INST_DESKTOP_DIR = $(DESTDIR)$(DESKTOP_DIR)
SEARCHPATH += src/plat/unix
_OBJS += unixInit.o
include common.mk
CXXFLAGS += `sdl2-config --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\"
CXXFLAGS += -fms-extensions
LDFLAGS += `sdl2-config --libs` -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lm -lz -lpng
SHARED_FILES = LICENSE README.md data gfx manual music sound icons
DIST_FILES = $(SHARED_FILES) locale $(PROG)
SRC_DIST_FILES = $(SHARED_FILES) src makefile* common.mk
# linking the program.
$(PROG): $(OBJS)
$(CC) -o $@ $(OBJS) $(LDFLAGS)
.PHONY: dist

View File

@ -1,21 +0,0 @@
PROG = blobwarsAttrition.exe
CC = x86_64-w64-mingw32-gcc
SDLC = /usr/x86_64-w64-mingw32/bin/sdl2-config
LIBPATH = /usr/x86_64-w64-mingw32/lib
LOCALE_DIR = locale
SEARCHPATH += src/plat/win32
_OBJS += win32Init.o
include common.mk
CXXFLAGS += `$(SDLC) --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\"
CXXFLAGS += -Wall -Wempty-body -ansi -pedantic -Werror -Wstrict-prototypes -Werror=maybe-uninitialized -Warray-bounds
CXXFLAGS += -g -lefence
CXXFLAGS += -fms-extensions -std=gnu11
LDFLAGS += `$(SDLC) --libs` -lm -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lSDL2main -lpng -lz
# linking the program.
$(PROG): $(OBJS)
$(CC) -o $@ $(OBJS) $(LDFLAGS) -L$(LIBPATH)