From: Konrad Rosenbaum Date: Tue, 30 Apr 2013 22:55:24 +0000 (+0200) Subject: fix elam to build in taurus X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=be5a66665bbb5fa17ba5dc852e46e6ea96d34efa;p=web%2Fkonrad%2Ftaurus.git fix elam to build in taurus --- diff --git a/.gitignore b/.gitignore index 261c447..23e564d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.bak *~ lib/ +.ctmp +Makefile* diff --git a/chester.pri b/chester.pri new file mode 100644 index 0000000..d4a690e --- /dev/null +++ b/chester.pri @@ -0,0 +1,4 @@ +#include this into your qmake project file to +#use the Chester library + +INCLUDEPATH += $$PWD/chester diff --git a/elam.pri b/elam.pri new file mode 100644 index 0000000..e825bae --- /dev/null +++ b/elam.pri @@ -0,0 +1,6 @@ +#include this into your qmake project file to +#use the ZIP library + +LIBS += -L$$PWD/lib -lelam +INCLUDEPATH += $$PWD/include/elam +CONFIG += link_prl \ No newline at end of file diff --git a/elam/README b/elam/README index 7e32ef8..5d9bf14 100644 --- a/elam/README +++ b/elam/README @@ -3,7 +3,7 @@ README for ELAM ELAM = Elementary Logic and Arithmetic Machine -(c) Konrad Rosenbaum, 2010-2012 +(c) Konrad Rosenbaum, 2010-2013 protected under the GNU LGPL version 3 or at your option any newer see COPYING(.LGPL) for details @@ -11,6 +11,6 @@ This engine can be fed simple arithmetic formulas and will calculate their result, similar to those used in languages like C or Pascal. It is not able to solve algebraic systems or use fancy expressions. -ELAM is based on and made for Qt 4.x. +ELAM is based on and made for Qt 4.x / 5.x. See the documentation for details. Just point your browser at doc/index.html. diff --git a/elam/elam.pro b/elam/elam.pro new file mode 100644 index 0000000..f751469 --- /dev/null +++ b/elam/elam.pro @@ -0,0 +1,40 @@ +TEMPLATE = lib +TARGET = elam +CONFIG += dll create_prl hide_symbols separate_debug_info +QT -= gui +OBJECTS_DIR = .ctmp +MOC_DIR = .ctmp +RCC_DIR = .ctmp +DEFINES += ELAM_LIBRARY_BUILD +VERSION = +DESTDIR = $$PWD/../lib + +HEADERS += \ + include/elam.h \ + include/elamunary.h \ + include/elambinary.h \ + include/elamcharclass.h \ + include/elamengine.h \ + include/elamexpression.h \ + include/elamvalue.h \ + include/elamintengine.h \ + include/elamfloatengine.h \ + include/elamboolengine.h \ + include/elamstringengine.h + +SOURCES += \ + src/elamvalue.cpp \ + src/elamunary.cpp \ + src/elambinary.cpp \ + src/elamcharclass.cpp \ + src/elamengine.cpp \ + src/elamintengine.cpp \ + src/elamexpression.cpp \ + src/elamfloatengine.cpp \ + src/elamboolengine.cpp \ + src/elamstringengine.cpp + +INCLUDEPATH += . src include ../include/elam ../chester +DEPENDPATH += $$INCLUDEPATH + +gcc { QMAKE_CXXFLAGS+=-std=c++11 } diff --git a/elam/include/ELAM/AnyType b/elam/include/ELAM/AnyType deleted file mode 100644 index 5fcdb6e..0000000 --- a/elam/include/ELAM/AnyType +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamvalue.h" diff --git a/elam/include/ELAM/BinaryOperator b/elam/include/ELAM/BinaryOperator deleted file mode 100644 index 9105013..0000000 --- a/elam/include/ELAM/BinaryOperator +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elambinary.h" diff --git a/elam/include/ELAM/BoolEngine b/elam/include/ELAM/BoolEngine deleted file mode 100644 index cc9401d..0000000 --- a/elam/include/ELAM/BoolEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamboolengine.h" diff --git a/elam/include/ELAM/CharacterClassSettings b/elam/include/ELAM/CharacterClassSettings deleted file mode 100644 index 4d4b633..0000000 --- a/elam/include/ELAM/CharacterClassSettings +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamcharclass.h" diff --git a/elam/include/ELAM/Engine b/elam/include/ELAM/Engine deleted file mode 100644 index bea5477..0000000 --- a/elam/include/ELAM/Engine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamengine.h" diff --git a/elam/include/ELAM/Exception b/elam/include/ELAM/Exception deleted file mode 100644 index 5fcdb6e..0000000 --- a/elam/include/ELAM/Exception +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamvalue.h" diff --git a/elam/include/ELAM/Expression b/elam/include/ELAM/Expression deleted file mode 100644 index c46a659..0000000 --- a/elam/include/ELAM/Expression +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamexpression.h" diff --git a/elam/include/ELAM/FloatEngine b/elam/include/ELAM/FloatEngine deleted file mode 100644 index 0e25e64..0000000 --- a/elam/include/ELAM/FloatEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamfloatengine.h" diff --git a/elam/include/ELAM/IntEngine b/elam/include/ELAM/IntEngine deleted file mode 100644 index 147f580..0000000 --- a/elam/include/ELAM/IntEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamintengine.h" diff --git a/elam/include/ELAM/IntFloatEngine b/elam/include/ELAM/IntFloatEngine deleted file mode 100644 index 0e25e64..0000000 --- a/elam/include/ELAM/IntFloatEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamfloatengine.h" diff --git a/elam/include/ELAM/Position b/elam/include/ELAM/Position deleted file mode 100644 index 5fcdb6e..0000000 --- a/elam/include/ELAM/Position +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamvalue.h" diff --git a/elam/include/ELAM/StringEngine b/elam/include/ELAM/StringEngine deleted file mode 100644 index fceaf33..0000000 --- a/elam/include/ELAM/StringEngine +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamstringengine.h" diff --git a/elam/include/ELAM/Token b/elam/include/ELAM/Token deleted file mode 100644 index c46a659..0000000 --- a/elam/include/ELAM/Token +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamexpression.h" diff --git a/elam/include/ELAM/UnaryOperator b/elam/include/ELAM/UnaryOperator deleted file mode 100644 index dcdf78b..0000000 --- a/elam/include/ELAM/UnaryOperator +++ /dev/null @@ -1,2 +0,0 @@ -//auto-generated code, do not change -#include "elamunary.h" diff --git a/elam/include/elambinary.h b/elam/include/elambinary.h index f18124c..de8adca 100644 --- a/elam/include/elambinary.h +++ b/elam/include/elambinary.h @@ -10,7 +10,7 @@ #include #include -#include "../dptr/dptr_base.h" +#include #include "elamglobal.h" #include diff --git a/elam/include/elamcharclass.h b/elam/include/elamcharclass.h index bda9fd8..5790921 100644 --- a/elam/include/elamcharclass.h +++ b/elam/include/elamcharclass.h @@ -12,7 +12,7 @@ #include "elamexpression.h" -#include "../dptr/dptr_base.h" +#include namespace ELAM { diff --git a/elam/include/elamengine.h b/elam/include/elamengine.h index 35e9054..81480d0 100644 --- a/elam/include/elamengine.h +++ b/elam/include/elamengine.h @@ -15,7 +15,7 @@ #include "elambinary.h" #include "elamcharclass.h" -#include "../dptr/dptr_base.h" +#include #include diff --git a/elam/include/elamexpression.h b/elam/include/elamexpression.h index 2311fbf..ed67a25 100644 --- a/elam/include/elamexpression.h +++ b/elam/include/elamexpression.h @@ -7,7 +7,7 @@ #define ELAM_EXPRESSION_H #include "elamvalue.h" -#include "../dptr/dptr_base.h" +#include namespace ELAM { diff --git a/elam/include/elamunary.h b/elam/include/elamunary.h index 79561d7..28a61f3 100644 --- a/elam/include/elamunary.h +++ b/elam/include/elamunary.h @@ -10,7 +10,7 @@ #include #include -#include "../dptr/dptr_base.h" +#include #include diff --git a/elam/src/elam.pro b/elam/src/elam.pro deleted file mode 100644 index f702706..0000000 --- a/elam/src/elam.pro +++ /dev/null @@ -1,39 +0,0 @@ -TEMPLATE = lib -TARGET = elam -CONFIG += dll create_prl hide_symbols separate_debug_info -QT -= gui -OBJECTS_DIR = .ctmp -MOC_DIR = .ctmp -RCC_DIR = .ctmp -DEFINES += ELAM_LIBRARY_BUILD -VERSION = - -HEADERS += \ - ../include/elam.h \ - ../include/elamunary.h \ - ../include/elambinary.h \ - ../include/elamcharclass.h \ - ../include/elamengine.h \ - ../include/elamexpression.h \ - ../include/elamvalue.h \ - ../include/elamintengine.h \ - ../include/elamfloatengine.h \ - ../include/elamboolengine.h \ - ../include/elamstringengine.h - -SOURCES += \ - elamvalue.cpp \ - elamunary.cpp \ - elambinary.cpp \ - elamcharclass.cpp \ - elamengine.cpp \ - elamintengine.cpp \ - elamexpression.cpp \ - elamfloatengine.cpp \ - elamboolengine.cpp \ - elamstringengine.cpp - -INCLUDEPATH += . ../include -DEPENDPATH += . ../include ../../chester - -gcc { QMAKE_CXXFLAGS+=-std=c++11 } diff --git a/elam/src/elambinary.cpp b/elam/src/elambinary.cpp index 4db88c2..a71ea61 100644 --- a/elam/src/elambinary.cpp +++ b/elam/src/elambinary.cpp @@ -7,7 +7,7 @@ #include "elamvalue.h" #include -#include "../dptr/dptr_shared.h" +#include namespace ELAM { ///////////////////////////////////////////////////////////////// diff --git a/elam/src/elamcharclass.cpp b/elam/src/elamcharclass.cpp index f67dfc4..b3dc05d 100644 --- a/elam/src/elamcharclass.cpp +++ b/elam/src/elamcharclass.cpp @@ -7,7 +7,7 @@ #include "elamvalue.h" #include -#include "../dptr/dptr_shared.h" +#include namespace ELAM { diff --git a/elam/src/elamengine.cpp b/elam/src/elamengine.cpp index 9b5a7d4..77b9715 100644 --- a/elam/src/elamengine.cpp +++ b/elam/src/elamengine.cpp @@ -7,7 +7,7 @@ #include "elamvalue.h" #include -#include "../dptr/dptr.h" +#include namespace ELAM { diff --git a/elam/src/elamexpression.cpp b/elam/src/elamexpression.cpp index 494d279..e868454 100644 --- a/elam/src/elamexpression.cpp +++ b/elam/src/elamexpression.cpp @@ -8,7 +8,7 @@ #include #include #include "elamengine.h" -#include "../dptr/dptr_shared.h" +#include namespace ELAM { diff --git a/elam/src/elamunary.cpp b/elam/src/elamunary.cpp index f3b6e5d..4539886 100644 --- a/elam/src/elamunary.cpp +++ b/elam/src/elamunary.cpp @@ -7,7 +7,7 @@ #include "elamvalue.h" #include -#include "../dptr/dptr_shared.h" +#include namespace ELAM { diff --git a/include/elam/ELAM/AnyType b/include/elam/ELAM/AnyType new file mode 100644 index 0000000..9bfc3f3 --- /dev/null +++ b/include/elam/ELAM/AnyType @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamvalue.h" diff --git a/include/elam/ELAM/BinaryOperator b/include/elam/ELAM/BinaryOperator new file mode 100644 index 0000000..fe17106 --- /dev/null +++ b/include/elam/ELAM/BinaryOperator @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elambinary.h" diff --git a/include/elam/ELAM/BoolEngine b/include/elam/ELAM/BoolEngine new file mode 100644 index 0000000..c9667ac --- /dev/null +++ b/include/elam/ELAM/BoolEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamboolengine.h" diff --git a/include/elam/ELAM/CharacterClassSettings b/include/elam/ELAM/CharacterClassSettings new file mode 100644 index 0000000..1d4b17d --- /dev/null +++ b/include/elam/ELAM/CharacterClassSettings @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamcharclass.h" diff --git a/include/elam/ELAM/Engine b/include/elam/ELAM/Engine new file mode 100644 index 0000000..1723269 --- /dev/null +++ b/include/elam/ELAM/Engine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamengine.h" diff --git a/include/elam/ELAM/Exception b/include/elam/ELAM/Exception new file mode 100644 index 0000000..9bfc3f3 --- /dev/null +++ b/include/elam/ELAM/Exception @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamvalue.h" diff --git a/include/elam/ELAM/Expression b/include/elam/ELAM/Expression new file mode 100644 index 0000000..c996a4c --- /dev/null +++ b/include/elam/ELAM/Expression @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamexpression.h" diff --git a/include/elam/ELAM/FloatEngine b/include/elam/ELAM/FloatEngine new file mode 100644 index 0000000..2a2d2c3 --- /dev/null +++ b/include/elam/ELAM/FloatEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamfloatengine.h" diff --git a/include/elam/ELAM/IntEngine b/include/elam/ELAM/IntEngine new file mode 100644 index 0000000..669bd55 --- /dev/null +++ b/include/elam/ELAM/IntEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamintengine.h" diff --git a/include/elam/ELAM/IntFloatEngine b/include/elam/ELAM/IntFloatEngine new file mode 100644 index 0000000..2a2d2c3 --- /dev/null +++ b/include/elam/ELAM/IntFloatEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamfloatengine.h" diff --git a/include/elam/ELAM/Position b/include/elam/ELAM/Position new file mode 100644 index 0000000..9bfc3f3 --- /dev/null +++ b/include/elam/ELAM/Position @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamvalue.h" diff --git a/include/elam/ELAM/StringEngine b/include/elam/ELAM/StringEngine new file mode 100644 index 0000000..c3f8266 --- /dev/null +++ b/include/elam/ELAM/StringEngine @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamstringengine.h" diff --git a/include/elam/ELAM/Token b/include/elam/ELAM/Token new file mode 100644 index 0000000..c996a4c --- /dev/null +++ b/include/elam/ELAM/Token @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamexpression.h" diff --git a/include/elam/ELAM/UnaryOperator b/include/elam/ELAM/UnaryOperator new file mode 100644 index 0000000..08138fd --- /dev/null +++ b/include/elam/ELAM/UnaryOperator @@ -0,0 +1,2 @@ +//auto-generated code, do not change +#include "../../../elam/include/elamunary.h" diff --git a/taurus.pro b/taurus.pro index 1214d70..6874a24 100644 --- a/taurus.pro +++ b/taurus.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = zip elam/src \ No newline at end of file +SUBDIRS = zip elam