move convenience headers to ELAM subdirectory

-> include <Exception> collides with system <exception> header file on windows
-> this change prevents the collision by requiring <ELAM/Exception>

diff --git a/include/AnyType b/include/ELAM/AnyType
similarity index 100%
rename from include/AnyType
rename to include/ELAM/AnyType

diff --git a/include/BinaryOperator b/include/ELAM/BinaryOperator
similarity index 100%
rename from include/BinaryOperator
rename to include/ELAM/BinaryOperator

diff --git a/include/BoolEngine b/include/ELAM/BoolEngine
similarity index 100%
rename from include/BoolEngine
rename to include/ELAM/BoolEngine

diff --git a/include/CharacterClassSettings b/include/ELAM/CharacterClassSettings
similarity index 100%
rename from include/CharacterClassSettings
rename to include/ELAM/CharacterClassSettings

diff --git a/include/Engine b/include/ELAM/Engine
similarity index 100%
rename from include/Engine
rename to include/ELAM/Engine

diff --git a/include/Exception b/include/ELAM/Exception
similarity index 100%
rename from include/Exception
rename to include/ELAM/Exception

diff --git a/include/Expression b/include/ELAM/Expression
similarity index 100%
rename from include/Expression
rename to include/ELAM/Expression

diff --git a/include/FloatEngine b/include/ELAM/FloatEngine
similarity index 100%
rename from include/FloatEngine
rename to include/ELAM/FloatEngine

diff --git a/include/IntEngine b/include/ELAM/IntEngine
similarity index 100%
rename from include/IntEngine
rename to include/ELAM/IntEngine

diff --git a/include/IntFloatEngine b/include/ELAM/IntFloatEngine
similarity index 100%
rename from include/IntFloatEngine
rename to include/ELAM/IntFloatEngine

diff --git a/include/Position b/include/ELAM/Position
similarity index 100%
rename from include/Position
rename to include/ELAM/Position

diff --git a/include/StringEngine b/include/ELAM/StringEngine
similarity index 100%
rename from include/StringEngine
rename to include/ELAM/StringEngine

diff --git a/include/Token b/include/ELAM/Token
similarity index 100%
rename from include/Token
rename to include/ELAM/Token

diff --git a/include/UnaryOperator b/include/ELAM/UnaryOperator
similarity index 100%
rename from include/UnaryOperator
rename to include/ELAM/UnaryOperator

diff --git a/src/elam.pro b/src/elam.pro
index edf89f9..d07e3cd 100644 (file)
--- a/src/elam.pro
+++ b/src/elam.pro
@@ -37,4 +37,4 @@ SOURCES += \
 INCLUDEPATH += . ../include
 DEPENDPATH += . ../include ../dptr
 
-QMAKE_CXXFLAGS+=-std=gnu++11
\ No newline at end of file
+gcc { QMAKE_CXXFLAGS+=-std=c++11 }

diff --git a/tests/eval/eval.pro b/tests/eval/eval.pro
index 57f87bc..1d1eb8f 100644 (file)
--- a/tests/eval/eval.pro
+++ b/tests/eval/eval.pro
@@ -1,12 +1,13 @@
 TEMPLATE = app
 TARGET = evaltest
 QT -= gui
-CONFIG += qtestlib debug link_prl
-INCLUDEPATH += . ../../src
-DEPENDPATH += $$INCLUDEPATH ../..
+CONFIG += testlib debug link_prl
+QT += testlib
+INCLUDEPATH += . ../../include
+DEPENDPATH += $$INCLUDEPATH ../.. ../../src
 LIBS += -L../.. -lelam
 
 SOURCES += eval.cpp
 HEADERS += eval.h
 
-QMAKE_CXXFLAGS+=-std=gnu++0x
\ No newline at end of file
+gcc { QMAKE_CXXFLAGS+=-std=c++11 }

diff --git a/tests/parser/parser.pro b/tests/parser/parser.pro
index 9fd3bc2..50a126c 100644 (file)
--- a/tests/parser/parser.pro
+++ b/tests/parser/parser.pro
@@ -1,12 +1,13 @@
 TEMPLATE = app
 TARGET = parsertest
 QT -= gui
-CONFIG += qtestlib debug link_prl
-INCLUDEPATH += . ../../src
-DEPENDPATH += $$INCLUDEPATH ../..
+CONFIG += testlib debug link_prl
+QT += testlib
+INCLUDEPATH += . ../../include
+DEPENDPATH += $$INCLUDEPATH ../.. ../../src
 LIBS += -L../.. -lelam
 
 SOURCES += parser.cpp
 HEADERS += parser.h
 
-QMAKE_CXXFLAGS+=-std=gnu++0x
\ No newline at end of file
+gcc { QMAKE_CXXFLAGS+=-std=c++11 }