From 64046250d42ac38200581ae04d42f75f933d1f58 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 23 Feb 2013 17:27:50 -0800
Subject: [PATCH] confusion, merge latest changes

---
 .gitignore            |  5 -----
 cmake                 |  2 +-
 configure             | 28 ----------------------------
 eressea               |  2 +-
 quicklist             |  2 +-
 scripts/arda/main.lua |  2 +-
 src/CMakeLists.txt    |  9 +--------
 7 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100755 configure

diff --git a/.gitignore b/.gitignore
index 4dc7b5650..1bf3ffbcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,3 @@ Release/
 *.sh
 src/*.vcproj.*.user
 tags
-build*/
-game/server
-game/data/
-game/reports/
-game/*.log
diff --git a/cmake b/cmake
index dcc663a7a..8cbbeef52 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit dcc663a7a08072b8a1ba0525b182b798c577ccf9
+Subproject commit 8cbbeef52b5807bdec52369322cbc9f21d5ed621
diff --git a/configure b/configure
deleted file mode 100755
index 20fbab8aa..000000000
--- a/configure
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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
diff --git a/eressea b/eressea
index 79feb5723..841876e33 160000
--- a/eressea
+++ b/eressea
@@ -1 +1 @@
-Subproject commit 79feb5723c075a45a1a94ed286c87993314ce8da
+Subproject commit 841876e3359e49d059704ee7b5aa7a138447f871
diff --git a/quicklist b/quicklist
index e9d0875c7..9426da896 160000
--- a/quicklist
+++ b/quicklist
@@ -1 +1 @@
-Subproject commit e9d0875c703291490baec3f582a5b3d30c18f5a0
+Subproject commit 9426da89690972fea3d594c7843a8f172c75c7ca
diff --git a/scripts/arda/main.lua b/scripts/arda/main.lua
index b9a146af3..c58fd654d 100644
--- a/scripts/arda/main.lua
+++ b/scripts/arda/main.lua
@@ -42,7 +42,7 @@ function process(orders)
   write_files(config.locales)
 
   file = "" .. get_turn() .. ".dat"
-  if eressea.write_game(file)~=0 then
+  if write_game(file, "binary")~=0 then
     print("could not write game")
     return -1
   end
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ac61c72d2..5655da466 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,14 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project (server C)
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DHAVE__BOOL")
-ELSE(CMAKE_COMPILER_IS_GNUCC)
-    MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-find_package (Lua 5 REQUIRED)
+find_package (Lua51 REQUIRED)
 find_package (LibXml2 REQUIRED)
 find_package (SQLite3 REQUIRED)
 find_package (ToLua REQUIRED)