flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed Expat / LuaExpat compilation for Linux

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1375 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-04-09 13:53:54 +00:00
parent 48cec90c3f
commit 9687041b14
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GNUmakefile
View File

@ -101,7 +101,8 @@ INCLUDE = -I.\
-IiniFile\
-Itolua++-1.0.93/include\
-Ijsoncpp-src-0.5.0/include\
-Ijsoncpp-src-0.5.0/src/lib_json
-Ijsoncpp-src-0.5.0/src/lib_json\
-Iexpat
# 2012_11_08 _X: Removed, see Globals.h
@ -119,7 +120,7 @@ INCLUDE = -I.\
# 2012_11_08 _X: Removed: squirrel_3_0_1_stable
SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile WebServer '(' -name '*.cpp' -o -name '*.c' ')')
SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile WebServer expat '(' -name '*.cpp' -o -name '*.c' ')')
SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES))
OBJECTS := $(patsubst %.c,$(BUILDDIR)%.o,$(SOURCES))
OBJECTS := $(patsubst %.cpp,$(BUILDDIR)%.o,$(OBJECTS))

3
expat/xmlparse.c
View File

@ -8,6 +8,9 @@
#define XML_BUILDING_EXPAT 1
// 2013_04_09 _X: Quick and dirty "fix" for expat compilation under Linux:
#define HAVE_MEMMOVE
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)