From 11c3161b2958ab71f406b8ea07e60ebaf7f69290 Mon Sep 17 00:00:00 2001 From: Konrad Rosenbaum Date: Sun, 30 Dec 2012 19:04:37 +0100 Subject: [PATCH] move convenience headers to ELAM subdirectory -> include collides with system header file on windows -> this change prevents the collision by requiring --- include/AnyType | 2 -- include/BinaryOperator | 2 -- include/BoolEngine | 2 -- include/CharacterClassSettings | 2 -- include/ELAM/AnyType | 2 ++ include/ELAM/BinaryOperator | 2 ++ include/ELAM/BoolEngine | 2 ++ include/ELAM/CharacterClassSettings | 2 ++ include/ELAM/Engine | 2 ++ include/ELAM/Exception | 2 ++ include/ELAM/Expression | 2 ++ include/ELAM/FloatEngine | 2 ++ include/ELAM/IntEngine | 2 ++ include/ELAM/IntFloatEngine | 2 ++ include/ELAM/Position | 2 ++ include/ELAM/StringEngine | 2 ++ include/ELAM/Token | 2 ++ include/ELAM/UnaryOperator | 2 ++ include/Engine | 2 -- include/Exception | 2 -- include/Expression | 2 -- include/FloatEngine | 2 -- include/IntEngine | 2 -- include/IntFloatEngine | 2 -- include/Position | 2 -- include/StringEngine | 2 -- include/Token | 2 -- include/UnaryOperator | 2 -- src/elam.pro | 2 +- tests/eval/eval.pro | 9 +++++---- tests/parser/parser.pro | 9 +++++---- 31 files changed, 39 insertions(+), 37 deletions(-) delete mode 100644 include/AnyType delete mode 100644 include/BinaryOperator delete mode 100644 include/BoolEngine delete mode 100644 include/CharacterClassSettings create mode 100644 include/ELAM/AnyType create mode 100644 include/ELAM/BinaryOperator create mode 100644 include/ELAM/BoolEngine create mode 100644 include/ELAM/CharacterClassSettings create mode 100644 include/ELAM/Engine create mode 100644 include/ELAM/Exception create mode 100644 include/ELAM/Expression create mode 100644 include/ELAM/FloatEngine create mode 100644 include/ELAM/IntEngine create mode 100644 include/ELAM/IntFloatEngine create mode 100644 include/ELAM/Position create mode 100644 include/ELAM/StringEngine create mode 100644 include/ELAM/Token create mode 100644 include/ELAM/UnaryOperator delete mode 100644 include/Engine delete mode 100644 include/Exception delete mode 100644 include/Expression delete mode 100644 include/FloatEngine delete mode 100644 include/IntEngine delete mode 100644 include/IntFloatEngine delete mode 100644 include/Position delete mode 100644 include/StringEngine delete mode 100644 include/Token delete mode 100644 include/UnaryOperator diff --git a/include/AnyType b/include/AnyType deleted file mode 100644 index 5fcdb6e..0000000 --- a/include/AnyType +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamvalue.h" diff --git a/include/BinaryOperator b/include/BinaryOperator deleted file mode 100644 index 9105013..0000000 --- a/include/BinaryOperator +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elambinary.h" diff --git a/include/BoolEngine b/include/BoolEngine deleted file mode 100644 index cc9401d..0000000 --- a/include/BoolEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamboolengine.h" diff --git a/include/CharacterClassSettings b/include/CharacterClassSettings deleted file mode 100644 index 4d4b633..0000000 --- a/include/CharacterClassSettings +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamcharclass.h" diff --git a/include/ELAM/AnyType b/include/ELAM/AnyType new file mode 100644 index 0000000..5fcdb6e --- /dev/null +++ b/include/ELAM/AnyType @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamvalue.h" diff --git a/include/ELAM/BinaryOperator b/include/ELAM/BinaryOperator new file mode 100644 index 0000000..9105013 --- /dev/null +++ b/include/ELAM/BinaryOperator @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elambinary.h" diff --git a/include/ELAM/BoolEngine b/include/ELAM/BoolEngine new file mode 100644 index 0000000..cc9401d --- /dev/null +++ b/include/ELAM/BoolEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamboolengine.h" diff --git a/include/ELAM/CharacterClassSettings b/include/ELAM/CharacterClassSettings new file mode 100644 index 0000000..4d4b633 --- /dev/null +++ b/include/ELAM/CharacterClassSettings @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamcharclass.h" diff --git a/include/ELAM/Engine b/include/ELAM/Engine new file mode 100644 index 0000000..bea5477 --- /dev/null +++ b/include/ELAM/Engine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamengine.h" diff --git a/include/ELAM/Exception b/include/ELAM/Exception new file mode 100644 index 0000000..5fcdb6e --- /dev/null +++ b/include/ELAM/Exception @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamvalue.h" diff --git a/include/ELAM/Expression b/include/ELAM/Expression new file mode 100644 index 0000000..c46a659 --- /dev/null +++ b/include/ELAM/Expression @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamexpression.h" diff --git a/include/ELAM/FloatEngine b/include/ELAM/FloatEngine new file mode 100644 index 0000000..0e25e64 --- /dev/null +++ b/include/ELAM/FloatEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamfloatengine.h" diff --git a/include/ELAM/IntEngine b/include/ELAM/IntEngine new file mode 100644 index 0000000..147f580 --- /dev/null +++ b/include/ELAM/IntEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamintengine.h" diff --git a/include/ELAM/IntFloatEngine b/include/ELAM/IntFloatEngine new file mode 100644 index 0000000..0e25e64 --- /dev/null +++ b/include/ELAM/IntFloatEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamfloatengine.h" diff --git a/include/ELAM/Position b/include/ELAM/Position new file mode 100644 index 0000000..5fcdb6e --- /dev/null +++ b/include/ELAM/Position @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamvalue.h" diff --git a/include/ELAM/StringEngine b/include/ELAM/StringEngine new file mode 100644 index 0000000..fceaf33 --- /dev/null +++ b/include/ELAM/StringEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamstringengine.h" diff --git a/include/ELAM/Token b/include/ELAM/Token new file mode 100644 index 0000000..c46a659 --- /dev/null +++ b/include/ELAM/Token @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamexpression.h" diff --git a/include/ELAM/UnaryOperator b/include/ELAM/UnaryOperator new file mode 100644 index 0000000..dcdf78b --- /dev/null +++ b/include/ELAM/UnaryOperator @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "elamunary.h" diff --git a/include/Engine b/include/Engine deleted file mode 100644 index bea5477..0000000 --- a/include/Engine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamengine.h" diff --git a/include/Exception b/include/Exception deleted file mode 100644 index 5fcdb6e..0000000 --- a/include/Exception +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamvalue.h" diff --git a/include/Expression b/include/Expression deleted file mode 100644 index c46a659..0000000 --- a/include/Expression +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamexpression.h" diff --git a/include/FloatEngine b/include/FloatEngine deleted file mode 100644 index 0e25e64..0000000 --- a/include/FloatEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamfloatengine.h" diff --git a/include/IntEngine b/include/IntEngine deleted file mode 100644 index 147f580..0000000 --- a/include/IntEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamintengine.h" diff --git a/include/IntFloatEngine b/include/IntFloatEngine deleted file mode 100644 index 0e25e64..0000000 --- a/include/IntFloatEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamfloatengine.h" diff --git a/include/Position b/include/Position deleted file mode 100644 index 5fcdb6e..0000000 --- a/include/Position +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamvalue.h" diff --git a/include/StringEngine b/include/StringEngine deleted file mode 100644 index fceaf33..0000000 --- a/include/StringEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamstringengine.h" diff --git a/include/Token b/include/Token deleted file mode 100644 index c46a659..0000000 --- a/include/Token +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamexpression.h" diff --git a/include/UnaryOperator b/include/UnaryOperator deleted file mode 100644 index dcdf78b..0000000 --- a/include/UnaryOperator +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamunary.h" diff --git a/src/elam.pro b/src/elam.pro index edf89f9..d07e3cd 100644 --- 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 --- 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 --- 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 } -- 1.7.2.5