From 389b4fe478d53747e60d1b8073143a68c6888b7d Mon Sep 17 00:00:00 2001 From: Anselme Date: Mon, 25 Sep 2017 16:11:37 +0200 Subject: [PATCH] fixed linux autolaunch --- .gitignore | 3 ++- .qmake.conf | 2 +- autolaunch.sh | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 455ecb5..c60731c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ bin/* build* *.user lib -deploy \ No newline at end of file +deploy +res/rpg.save diff --git a/.qmake.conf b/.qmake.conf index 4b61356..568128a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ -bin_dir=$$PWD/bin +bin_dir=$$PWD/deploy lib_dir=$$PWD/lib mmokoban_lib_dir=$$PWD/../mmokoban/lib include_dir=$$PWD/../mmokoban/src diff --git a/autolaunch.sh b/autolaunch.sh index d831259..7c67116 100755 --- a/autolaunch.sh +++ b/autolaunch.sh @@ -1,19 +1,19 @@ #!/bin/sh -mkdir SparrowBot/build -mkdir mmokoban/build +mkdir build +cd ../mmokoban +mkdir build while true do - cd mmokoban git pull cd build qmake-qt5 ../mmokoban.pro - make -j4 + make cd ../../SparrowBot git pull cd build qmake-qt5 ../SparrowBot.pro - make -j4 + make cd ../deploy ./SparrowBot -nogui nick=SirSparrow pass=$1 chan=epicsparrow server=irc.freenode.net port=6667 - cd ../.. + cd ../../mmokoban done