diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-04-29 14:21:27 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-04-29 14:21:27 +0200 |
| commit | 6fe3adab8ef3c9ab93a92c132f9809851a4dda74 (patch) | |
| tree | 022e0e5073c41710cf4591bfe9c320e2cc607627 | |
| parent | 99cc7c67b1efedee1c715a93511a2331a3df0be5 (diff) | |
| parent | 68955e294ea772b5a37653b3c871f6ca6268324d (diff) | |
| download | astra-6fe3adab8ef3c9ab93a92c132f9809851a4dda74.tar.gz astra-6fe3adab8ef3c9ab93a92c132f9809851a4dda74.tar.bz2 astra-6fe3adab8ef3c9ab93a92c132f9809851a4dda74.tar.xz astra-6fe3adab8ef3c9ab93a92c132f9809851a4dda74.zip | |
Merge pull request #57 from valeriysokolov/fix-rapidxml-includes
Now include path is system-independent.
| -rw-r--r-- | build/linux/Makefile.in | 2 | ||||
| -rw-r--r-- | src/XMLDocument.cpp | 5 | ||||
| -rw-r--r-- | src/XMLNode.cpp | 5 |
3 files changed, 1 insertions, 11 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 0dfa15a..2d862f2 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -28,7 +28,7 @@ CXXFLAGS=@SAVED_CXXFLAGS@ LDFLAGS=@SAVED_LDFLAGS@ LIBS=@SAVED_LIBS@ -CPPFLAGS+=-I../.. -I../../include -I../../lib/include/rapidxml +CPPFLAGS+=-I../.. -I../../include -I../../lib/include CXXFLAGS+=-g -O3 -Wall -Wshadow LIBS+=-lpthread LDFLAGS+=-g diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp index 406564f..da843b4 100644 --- a/src/XMLDocument.cpp +++ b/src/XMLDocument.cpp @@ -32,13 +32,8 @@ $Id$ #include <iostream> #include <sstream> -#ifdef _MSC_VER #include "rapidxml/rapidxml.hpp" #include "rapidxml/rapidxml_print.hpp" -#else -#include "rapidxml.hpp" -#include "rapidxml_print.hpp" -#endif using namespace rapidxml; using namespace astra; diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp index 4b2bdf4..5e9d927 100644 --- a/src/XMLNode.cpp +++ b/src/XMLNode.cpp @@ -28,13 +28,8 @@ $Id$ #include "astra/XMLNode.h" -#ifdef _MSC_VER #include "rapidxml/rapidxml.hpp" #include "rapidxml/rapidxml_print.hpp" -#else -#include "rapidxml.hpp" -#include "rapidxml_print.hpp" -#endif #include <boost/lexical_cast.hpp> |