Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moving some things around in the external directory. 

I am deliberately breaking the VS2010 projects with this.
I am probably breaking the Eressea server.
This commit is contained in:
Enno Rehling 2012-05-30 19:17:08 -07:00
parent 77be59a223
commit 889ef08189
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -21,14 +21,26 @@ if (WIN32)
else (WIN32) else (WIN32)
include_directories (/usr/include/lua5.1/ /usr/include/libxml2) include_directories (/usr/include/lua5.1/ /usr/include/libxml2)
endif (WIN32) endif (WIN32)
include_directories (../external ../shared/src)
include_directories (
../external/bson
../external/crypto
../external/cutest
../external/critbit
../external/iniparser
../external/pdcurses
../shared/src
)
set (LIB_SRCS set (LIB_SRCS
../external/md5.c
../external/bson/bson.c ../external/bson/bson.c
../external/bson/numbers.c ../external/bson/numbers.c
../external/dlmalloc/malloc.c ../external/critbit/critbit.c
../external/crypto/md5.c
../external/crypto/mt19937ar.c
../external/cutest/CuTest.c ../external/cutest/CuTest.c
../external/dlmalloc/malloc.c
../external/iniparser/iniparser.c
../shared/src/build/gamecode.c ../shared/src/build/gamecode.c
../shared/src/build/kernel.c ../shared/src/build/kernel.c
../shared/src/build/lib.c ../shared/src/build/lib.c
@ -40,8 +52,9 @@ set (LINK_LIBS tolua xml2 ncurses lua5.1 pthread)
if (NEED_SQLITE) if (NEED_SQLITE)
set(LIB_SRCS set(LIB_SRCS
${LIB_SRCS} ${LIB_SRCS}
../external/sqlite3.c ../external/sqlite3/sqlite3.c
) )
include_directories (../external/sqlite3)
else (NEED_SQLITE) else (NEED_SQLITE)
set (LINK_LIBS ${LINK_LIBS} sqlite3) set (LINK_LIBS ${LINK_LIBS} sqlite3)
endif (NEED_SQLITE) endif (NEED_SQLITE)

2
src/main.c
View File

@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <gmtool.h> #include <gmtool.h>
#include <kernel/config.h> #include <kernel/config.h>
#include <kernel/save.h> #include <kernel/save.h>
#include <iniparser/iniparser.h> #include <iniparser.h>
#include <assert.h> #include <assert.h>
#include <locale.h> #include <locale.h>