Removing fparser 2.x...

[architektonas] / architektonas.pro

diff --git a/architektonas.pro b/architektonas.pro
index 7bb1245d3ac6cdefd867d99c643f877168744d55..39e1022ddfac0f0b55875696c9625266fc06ec83 100644 (file)
--- a/architektonas.pro
+++ b/architektonas.pro
@@ -10,7 +10,7 @@
 
 CONFIG    += qt warn_on release debug
 RESOURCES += src/forms/res/architektonas.qrc
-LIBS      += -Ldxflib/lib -ldxf -Lfparser/lib -lfparser
+LIBS      += -Ldxflib/lib -ldxf
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
 OBJECTS_DIR = obj
@@ -19,7 +19,7 @@ RCC_DIR     = obj
 UI_DIR      = obj
 
 INCLUDEPATH += \
-       fparser/include \
+       fparser-4.3 \
        dxflib/include \
        src/mainapp \
        src/actions \
@@ -28,6 +28,9 @@ INCLUDEPATH += \
        src/forms
 
 HEADERS = \
+       fparser-4.3/fparser.hh
+
+HEADERS += \
        src/base/actioninterface.h \
        src/base/arc.h \
        src/base/atomicentity.h \
@@ -106,6 +109,10 @@ HEADERS = \
        src/base/vectorsolutions.h
 
 SOURCES = \
+       fparser-4.3/fparser.cc \
+       fparser-4.3/fpoptimizer.cc
+
+SOURCES += \
        src/base/actioninterface.cpp \
        src/base/arc.cpp \
        src/base/atomicentity.cpp \