confusion, merge latest changes

This commit is contained in:
Enno Rehling 2013-02-23 17:27:50 -08:00
parent 173c18d4b2
commit 64046250d4
7 changed files with 5 additions and 45 deletions

5
.gitignore vendored
View File

@ -11,8 +11,3 @@ Release/
*.sh *.sh
src/*.vcproj.*.user src/*.vcproj.*.user
tags tags
build*/
game/server
game/data/
game/reports/
game/*.log

2
cmake

@ -1 +1 @@
Subproject commit dcc663a7a08072b8a1ba0525b182b798c577ccf9 Subproject commit 8cbbeef52b5807bdec52369322cbc9f21d5ed621

28
configure vendored
View File

@ -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

@ -1 +1 @@
Subproject commit 79feb5723c075a45a1a94ed286c87993314ce8da Subproject commit 841876e3359e49d059704ee7b5aa7a138447f871

@ -1 +1 @@
Subproject commit e9d0875c703291490baec3f582a5b3d30c18f5a0 Subproject commit 9426da89690972fea3d594c7843a8f172c75c7ca

View File

@ -42,7 +42,7 @@ function process(orders)
write_files(config.locales) write_files(config.locales)
file = "" .. get_turn() .. ".dat" file = "" .. get_turn() .. ".dat"
if eressea.write_game(file)~=0 then if write_game(file, "binary")~=0 then
print("could not write game") print("could not write game")
return -1 return -1
end end

View File

@ -1,14 +1,7 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project (server C) project (server C)
IF(CMAKE_COMPILER_IS_GNUCC) find_package (Lua51 REQUIRED)
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 (LibXml2 REQUIRED) find_package (LibXml2 REQUIRED)
find_package (SQLite3 REQUIRED) find_package (SQLite3 REQUIRED)
find_package (ToLua REQUIRED) find_package (ToLua REQUIRED)