diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-09 15:53:54 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-09 15:53:54 +0200 |
| commit | 9687041b1494a47a799138d0f952928357f9c9ef (patch) | |
| tree | 886b102c6621a3e8e0cfdfdf506f13196aec8594 | |
| parent | Added Expat and LuaExpat, XML parsing now available in the API. (diff) | |
| download | cuberite-9687041b1494a47a799138d0f952928357f9c9ef.tar cuberite-9687041b1494a47a799138d0f952928357f9c9ef.tar.gz cuberite-9687041b1494a47a799138d0f952928357f9c9ef.tar.bz2 cuberite-9687041b1494a47a799138d0f952928357f9c9ef.tar.lz cuberite-9687041b1494a47a799138d0f952928357f9c9ef.tar.xz cuberite-9687041b1494a47a799138d0f952928357f9c9ef.tar.zst cuberite-9687041b1494a47a799138d0f952928357f9c9ef.zip | |
| -rw-r--r-- | GNUmakefile | 5 | ||||
| -rw-r--r-- | expat/xmlparse.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 4907f7217..8a53989c1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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)) diff --git a/expat/xmlparse.c b/expat/xmlparse.c index 5d6b59893..115b42127 100644 --- a/expat/xmlparse.c +++ b/expat/xmlparse.c @@ -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) |