X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=architektonas.pro;h=b9b6b50c33e15a967f15646aeafefd348e6d78fd;hb=bfd926cd5fd98e95b8b172fabd5340c9b1957e01;hp=3824c0363270651650b4f657b86d45364eedf791;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/architektonas.pro b/architektonas.pro
index 3824c03..b9b6b50 100644
--- 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,16 @@ RCC_DIR     = obj
 UI_DIR      = obj
 
 INCLUDEPATH += \
-	fparser/include \
+	fparser \
+	dxflib/include \
+	src/mainapp \
+	src/actions \
+	src/base \
+	src/widgets \
+	src/forms
+
+DEPENDPATH = \
+	fparser \
 	dxflib/include \
 	src/mainapp \
 	src/actions \
@@ -28,7 +37,9 @@ INCLUDEPATH += \
 	src/forms
 
 HEADERS = \
-	src/base/rs.h \
+	fparser/fparser.hh
+
+HEADERS += \
 	src/base/actioninterface.h \
 	src/base/arc.h \
 	src/base/atomicentity.h \
@@ -55,6 +66,7 @@ HEADERS = \
 	src/base/ellipse.h \
 	src/base/entity.h \
 	src/base/entitycontainer.h \
+	src/base/enums.h \
 	src/base/eventhandler.h \
 	src/base/fileio.h \
 	src/base/filtercxf.h \
@@ -86,13 +98,9 @@ HEADERS = \
 	src/base/point.h \
 	src/base/polyline.h \
 	src/base/preview.h \
-	src/base/python.h \
-	src/base/python_wrappers.h \
 	src/base/script.h \
 	src/base/scriptlist.h \
 	src/base/selection.h \
-	src/base/simplepython.h \
-	src/base/snapper.h \
 	src/base/solid.h \
 	src/base/spline.h \
 	src/base/staticgraphicview.h \
@@ -108,7 +116,14 @@ HEADERS = \
 	src/base/vector.h \
 	src/base/vectorsolutions.h
 
+#	src/base/snapper.h \
+#
+
 SOURCES = \
+	fparser/fparser.cc \
+	fparser/fpoptimizer.cc
+
+SOURCES += \
 	src/base/actioninterface.cpp \
 	src/base/arc.cpp \
 	src/base/atomicentity.cpp \
@@ -133,6 +148,7 @@ SOURCES = \
 	src/base/ellipse.cpp \
 	src/base/entity.cpp \
 	src/base/entitycontainer.cpp \
+	src/base/enums.cpp \
 	src/base/eventhandler.cpp \
 	src/base/fileio.cpp \
 	src/base/filtercxf.cpp \
@@ -162,13 +178,9 @@ SOURCES = \
 	src/base/point.cpp \
 	src/base/polyline.cpp \
 	src/base/preview.cpp \
-	src/base/python.cpp \
-	src/base/python_wrappers.cpp \
 	src/base/script.cpp \
 	src/base/scriptlist.cpp \
 	src/base/selection.cpp \
-	src/base/simplepython.cpp \
-	src/base/snapper.cpp \
 	src/base/solid.cpp \
 	src/base/spline.cpp \
 	src/base/staticgraphicview.cpp \
@@ -184,6 +196,9 @@ SOURCES = \
 	src/base/vector.cpp \
 	src/base/vectorsolutions.cpp
 
+#	src/base/snapper.cpp \
+#
+
 HEADERS += \
 	src/actions/actionblocksadd.h \
 	src/actions/actionblocksattributes.h \
@@ -268,6 +283,12 @@ HEADERS += \
 	src/actions/actionmodifytrim.h \
 	src/actions/actionmodifytrimamount.h \
 	src/actions/actionoptionsdrawing.h \
+	src/actions/actiondrawpolyline.h \
+	src/actions/actionpolylineadd.h \
+	src/actions/actionpolylineappend.h \
+	src/actions/actionpolylinedel.h \
+	src/actions/actionpolylinedelbetween.h \
+	src/actions/actionpolylinetrim.h \
 	src/actions/actionprintpreview.h \
 	src/actions/actionselect.h \
 	src/actions/actionselectall.h \
@@ -375,6 +396,12 @@ SOURCES += \
 	src/actions/actionmodifytrim.cpp \
 	src/actions/actionmodifytrimamount.cpp \
 	src/actions/actionoptionsdrawing.cpp \
+	src/actions/actiondrawpolyline.cpp \
+	src/actions/actionpolylineadd.cpp \
+	src/actions/actionpolylineappend.cpp \
+	src/actions/actionpolylinedel.cpp \
+	src/actions/actionpolylinedelbetween.cpp \
+	src/actions/actionpolylinetrim.cpp \
 	src/actions/actionprintpreview.cpp \
 	src/actions/actionselect.cpp \
 	src/actions/actionselectall.cpp \
@@ -461,6 +488,7 @@ HEADERS += \
 	src/forms/linerelangleoptions.h \
 	src/forms/mousewidget.h \
 	src/forms/moverotateoptions.h \
+	src/forms/polylineoptions.h \
 	src/forms/printpreviewoptions.h \
 	src/forms/roundoptions.h \
 	src/forms/selectionwidget.h \
@@ -549,6 +577,7 @@ SOURCES += \
 	src/forms/linerelangleoptions.cpp \
 	src/forms/mousewidget.cpp \
 	src/forms/moverotateoptions.cpp \
+	src/forms/polylineoptions.cpp \
 	src/forms/printpreviewoptions.cpp \
 	src/forms/roundoptions.cpp \
 	src/forms/selectionwidget.cpp \