summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawnCable <lawncable.gitlab@simonlaux.de>2018-12-22 21:51:53 +0100
committerLawnCable <lawncable.gitlab@simonlaux.de>2018-12-22 21:51:53 +0100
commitaffe94e75d1a0484939aad478141083fd309e627 (patch)
treed925902634ff6a401e785823f7ac856f01668fb6
parent5cf268dd838518bd280db2a133ada944af9e67e7 (diff)
downloadappimg-builder-affe94e75d1a0484939aad478141083fd309e627.tar.gz
appimg-builder-affe94e75d1a0484939aad478141083fd309e627.tar.bz2
appimg-builder-affe94e75d1a0484939aad478141083fd309e627.tar.xz
appimg-builder-affe94e75d1a0484939aad478141083fd309e627.zip
remove `apt-get -y build-dep manaplus` and add gcc + g++
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--build.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dab7fe8..7a39228 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
BuildAppImage:
image: ubuntu:trusty
script:
- - apt-get update -qq && apt install -y wget make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps
+ - apt-get update -qq && apt install -y gcc-4 g++-4 wget make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps
- cd /builds/mana-launcher/mplusbuilder
- chmod +x build.sh
- chmod +x linuxdeploy-x86_64.AppImage
diff --git a/build.sh b/build.sh
index f5c7788..3a528ac 100644
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
set -e
# Install dependencies
-apt-get -y build-dep manaplus
+#apt-get -y build-dep manaplus
# clone repo