summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerii Sokolov <valerii.sokolov@uantwerpen.be>2015-04-29 13:46:47 +0200
committerValerii Sokolov <valerii.sokolov@uantwerpen.be>2015-04-29 13:46:47 +0200
commit68955e294ea772b5a37653b3c871f6ca6268324d (patch)
tree022e0e5073c41710cf4591bfe9c320e2cc607627
parent99cc7c67b1efedee1c715a93511a2331a3df0be5 (diff)
downloadastra-68955e294ea772b5a37653b3c871f6ca6268324d.tar.gz
astra-68955e294ea772b5a37653b3c871f6ca6268324d.tar.bz2
astra-68955e294ea772b5a37653b3c871f6ca6268324d.tar.xz
astra-68955e294ea772b5a37653b3c871f6ca6268324d.zip
Now include path is system-independent.
-rw-r--r--build/linux/Makefile.in2
-rw-r--r--src/XMLDocument.cpp5
-rw-r--r--src/XMLNode.cpp5
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>