From ccac0f824bd715f1a98b1289ae69877abc7a84c5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 18 Feb 2013 01:28:39 +0000 Subject: [PATCH 1/7] use new 64-bit safe version of quicklist --- quicklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicklist b/quicklist index 23d8a36de..89719053f 160000 --- a/quicklist +++ b/quicklist @@ -1 +1 @@ -Subproject commit 23d8a36de9cd909aee2aac11c18f9f1311a30b40 +Subproject commit 89719053f50299604e2ea539dac04597480d1acf From b4cea49843a0ada276fed46003ed757da4db3744 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 18 Feb 2013 01:29:15 +0000 Subject: [PATCH 2/7] copy the configure script from the arda server, it is useful --- configure | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 configure diff --git a/configure b/configure new file mode 100755 index 000000000..20fbab8aa --- /dev/null +++ b/configure @@ -0,0 +1,28 @@ +#!/bin/sh +MACHINE=`uname -m` +BIN_DIR="build-$MACHINE-Debug" +[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" +[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" +[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" +[ -z "$JOBS" ] && JOBS=1 + +DISTCC=`which distcc` +if [ ! -z "$DISTCC" ] ; then +JOBS=`distcc -j` +if [ -z "$JOBS" ] ; then +JOBS=1 +elif [ $JOBS -gt 1 ] ; then +CC="distcc $CC" +MAKEOPTS=-j$JOBS +fi +fi +echo "Building with $CC and $JOBS jobs" + +mkdir -p $BIN_DIR +cd $BIN_DIR +CC="$CC" cmake .. -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules -DCMAKE_BUILD_TYPE=Debug +make -j$JOBS +make test +cd ../game +ln -sf ../$BIN_DIR/server/server +./server -e run_tests From 14f83b91e62950bc300a1433471ca64c36ab5eef Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 18 Feb 2013 01:41:04 +0000 Subject: [PATCH 3/7] update configure script for multiple game directories --- configure | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 20fbab8aa..8bebf3813 100755 --- a/configure +++ b/configure @@ -23,6 +23,10 @@ cd $BIN_DIR CC="$CC" cmake .. -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules -DCMAKE_BUILD_TYPE=Debug make -j$JOBS make test -cd ../game -ln -sf ../$BIN_DIR/server/server -./server -e run_tests +cd .. +for GAME in game* ; do + cd $GAME + ln -sf ../$BIN_DIR/server/server + ./server -e run_tests + cd .. +done From f60e926ec3ad9c27089728da982a977547df46c8 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 18 Feb 2013 14:40:37 -0800 Subject: [PATCH 4/7] latest quicklist version, tests compile on 64-bit compilers --- quicklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicklist b/quicklist index 89719053f..e9d0875c7 160000 --- a/quicklist +++ b/quicklist @@ -1 +1 @@ -Subproject commit 89719053f50299604e2ea539dac04597480d1acf +Subproject commit e9d0875c703291490baec3f582a5b3d30c18f5a0 From ebf8193620d40223d3fe90f6dbfc452d0feb165a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 28 Apr 2013 03:16:04 +0200 Subject: [PATCH 5/7] use new version of core --- eressea | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eressea b/eressea index f6b5728b4..90578358c 160000 --- a/eressea +++ b/eressea @@ -1 +1 @@ -Subproject commit f6b5728b4925afcb5c9b1cf64a0cc74ea2e09304 +Subproject commit 90578358caa68e31d77fe2ceae100ad368cb6054 From d313a73de9398b9d4c1ed8dc47990854ab617272 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 28 Apr 2013 03:58:08 +0200 Subject: [PATCH 6/7] import a fix from quicklist --- quicklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicklist b/quicklist index e9d0875c7..1164cda67 160000 --- a/quicklist +++ b/quicklist @@ -1 +1 @@ -Subproject commit e9d0875c703291490baec3f582a5b3d30c18f5a0 +Subproject commit 1164cda6777c69981d456b69019575f868aeb536 From 71fd2a4739a178e4afa42376473383783c0bc869 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 1 May 2013 13:24:53 -0700 Subject: [PATCH 7/7] include curses in linker and include flags --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 782fa8b3c..52eeee45c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,6 +23,7 @@ include_directories (${LUA_INCLUDE_DIR}) include_directories (${LIBXML2_INCLUDE_DIR}) include_directories (${BSON_INCLUDE_DIR}) include_directories (${INIPARSER_INCLUDE_DIR}) +include_directories (${CURSES_INCLUDE_DIR}) set (SERVER_SRC races/races.c @@ -49,4 +50,5 @@ target_link_libraries(server ${TOLUA_LIBRARIES} ${LUA_LIBRARIES} ${SQLITE3_LIBRARIES} + ${CURSES_LIBRARIES} )