X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=architektonas.pro;h=b9b6b50c33e15a967f15646aeafefd348e6d78fd;hb=bfd926cd5fd98e95b8b172fabd5340c9b1957e01;hp=3b99e2d9044ef301a9708dd8666cd5ffa241a406;hpb=7efabf993d0acf72e4f7df5e3ccfa4513b070be6;p=architektonas

diff --git a/architektonas.pro b/architektonas.pro
index 3b99e2d..b9b6b50 100644
--- a/architektonas.pro
+++ b/architektonas.pro
@@ -2,14 +2,15 @@
 # Architektonas Qt project file
 #
 # by James L. Hammons
-# (C) 2010 Underground Software
+# Copyright (C) 2010 Underground Software
 #
 # Parts are based on QCad Community Edition by Andrew Mustun
+# See the README and GPLv2 files for licensing and warranty information
 #
 
 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
@@ -18,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 \
@@ -27,162 +37,168 @@ INCLUDEPATH += \
 	src/forms
 
 HEADERS = \
-	src/base/rs.h \
+	fparser/fparser.hh
+
+HEADERS += \
 	src/base/actioninterface.h \
-	src/base/rs_arc.h \
-	src/base/rs_atomicentity.h \
-	src/base/rs_block.h \
-	src/base/rs_blocklist.h \
-	src/base/rs_circle.h \
-	src/base/rs_clipboard.h \
-	src/base/rs_color.h \
-	src/base/rs_commandevent.h \
-	src/base/rs_creation.h \
-	src/base/rs_constructionline.h \
-	src/base/rs_debug.h \
-	src/base/rs_dialogfactory.h \
-	src/base/rs_dialogfactoryinterface.h \
-	src/base/rs_dialogfactoryadapter.h \
-	src/base/rs_dimaligned.h \
-	src/base/rs_dimangular.h \
-	src/base/rs_dimdiametric.h \
-	src/base/rs_dimension.h \
-	src/base/rs_dimlinear.h \
-	src/base/rs_dimradial.h \
-	src/base/rs_document.h \
+	src/base/arc.h \
+	src/base/atomicentity.h \
+	src/base/block.h \
+	src/base/blocklist.h \
+	src/base/circle.h \
+	src/base/clipboard.h \
+	src/base/color.h \
+	src/base/commandevent.h \
+	src/base/creation.h \
+	src/base/constructionline.h \
+	src/base/debug.h \
+	src/base/dialogfactory.h \
+	src/base/dialogfactoryinterface.h \
+	src/base/dialogfactoryadapter.h \
+	src/base/dimaligned.h \
+	src/base/dimangular.h \
+	src/base/dimdiametric.h \
+	src/base/dimension.h \
+	src/base/dimlinear.h \
+	src/base/dimradial.h \
+	src/base/document.h \
 	src/base/drawing.h \
-	src/base/rs_ellipse.h \
-	src/base/rs_entity.h \
-	src/base/rs_entitycontainer.h \
-	src/base/rs_eventhandler.h \
-	src/base/rs_fileio.h \
-	src/base/rs_filtercxf.h \
-	src/base/rs_filterdxf.h \
-	src/base/rs_filterdxf1.h \
-	src/base/rs_filterinterface.h \
-	src/base/rs_flags.h \
-	src/base/rs_font.h \
-	src/base/rs_fontchar.h \
-	src/base/rs_fontlist.h \
-	src/base/rs_grid.h \
-	src/base/rs_hatch.h \
-	src/base/rs_image.h \
-	src/base/rs_information.h \
-	src/base/rs_infoarea.h \
-	src/base/rs_insert.h \
-	src/base/rs_layer.h \
-	src/base/rs_layerlist.h \
-	src/base/rs_leader.h \
-	src/base/rs_line.h \
-	src/base/rs_linetypepattern.h \
-	src/base/rs_mainwindowinterface.h \
-	src/base/rs_math.h \
-	src/base/rs_modification.h \
+	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 \
+	src/base/filterdxf.h \
+	src/base/filterdxf1.h \
+	src/base/filterinterface.h \
+	src/base/flags.h \
+	src/base/font.h \
+	src/base/fontchar.h \
+	src/base/fontlist.h \
+	src/base/grid.h \
+	src/base/hatch.h \
+	src/base/image.h \
+	src/base/information.h \
+	src/base/infoarea.h \
+	src/base/insert.h \
+	src/base/layer.h \
+	src/base/layerlist.h \
+	src/base/leader.h \
+	src/base/line.h \
+	src/base/linetypepattern.h \
+	src/base/mainwindowinterface.h \
+	src/base/mathextra.h \
+	src/base/modification.h \
 	src/base/paintinterface.h \
-	src/base/rs_pattern.h \
-	src/base/rs_patternlist.h \
-	src/base/rs_pen.h \
-	src/base/rs_point.h \
-	src/base/rs_polyline.h \
-	src/base/rs_preview.h \
-	src/base/rs_python.h \
-	src/base/rs_python_wrappers.h \
-	src/base/rs_script.h \
-	src/base/rs_scriptlist.h \
-	src/base/rs_selection.h \
-	src/base/rs_simplepython.h \
-	src/base/rs_snapper.h \
-	src/base/rs_solid.h \
-	src/base/rs_spline.h \
-	src/base/rs_staticgraphicview.h \
-	src/base/rs_system.h \
-	src/base/rs_text.h \
-	src/base/rs_undo.h \
-	src/base/rs_undoable.h \
-	src/base/rs_undocycle.h \
-	src/base/rs_units.h \
-	src/base/rs_utility.h \
-	src/base/rs_variable.h \
-	src/base/rs_variabledict.h \
+	src/base/pattern.h \
+	src/base/patternlist.h \
+	src/base/pen.h \
+	src/base/point.h \
+	src/base/polyline.h \
+	src/base/preview.h \
+	src/base/script.h \
+	src/base/scriptlist.h \
+	src/base/selection.h \
+	src/base/solid.h \
+	src/base/spline.h \
+	src/base/staticgraphicview.h \
+	src/base/system.h \
+	src/base/text.h \
+	src/base/undo.h \
+	src/base/undoable.h \
+	src/base/undocycle.h \
+	src/base/units.h \
+	src/base/utility.h \
+	src/base/variable.h \
+	src/base/variabledict.h \
 	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/rs_arc.cpp \
-	src/base/rs_atomicentity.cpp \
-	src/base/rs_block.cpp \
-	src/base/rs_blocklist.cpp \
-	src/base/rs_clipboard.cpp \
-	src/base/rs_circle.cpp \
-	src/base/rs_color.cpp \
-	src/base/rs_commandevent.cpp \
-	src/base/rs_constructionline.cpp \
-	src/base/rs_creation.cpp \
-	src/base/rs_debug.cpp \
-	src/base/rs_dialogfactory.cpp \
-	src/base/rs_dimaligned.cpp \
-	src/base/rs_dimangular.cpp \
-	src/base/rs_dimdiametric.cpp \
-	src/base/rs_dimension.cpp \
-	src/base/rs_dimlinear.cpp \
-	src/base/rs_dimradial.cpp \
-	src/base/rs_document.cpp \
+	src/base/arc.cpp \
+	src/base/atomicentity.cpp \
+	src/base/block.cpp \
+	src/base/blocklist.cpp \
+	src/base/clipboard.cpp \
+	src/base/circle.cpp \
+	src/base/color.cpp \
+	src/base/commandevent.cpp \
+	src/base/constructionline.cpp \
+	src/base/creation.cpp \
+	src/base/debug.cpp \
+	src/base/dialogfactory.cpp \
+	src/base/dimaligned.cpp \
+	src/base/dimangular.cpp \
+	src/base/dimdiametric.cpp \
+	src/base/dimension.cpp \
+	src/base/dimlinear.cpp \
+	src/base/dimradial.cpp \
+	src/base/document.cpp \
 	src/base/drawing.cpp \
-	src/base/rs_ellipse.cpp \
-	src/base/rs_entity.cpp \
-	src/base/rs_entitycontainer.cpp \
-	src/base/rs_eventhandler.cpp \
-	src/base/rs_fileio.cpp \
-	src/base/rs_filtercxf.cpp \
-	src/base/rs_filterdxf.cpp \
-	src/base/rs_filterdxf1.cpp \
-	src/base/rs_filterinterface.cpp \
-	src/base/rs_flags.cpp \
-	src/base/rs_font.cpp \
-	src/base/rs_fontlist.cpp \
-	src/base/rs_grid.cpp \
-	src/base/rs_hatch.cpp \
-	src/base/rs_image.cpp \
-	src/base/rs_information.cpp \
-	src/base/rs_infoarea.cpp \
-	src/base/rs_insert.cpp \
-	src/base/rs_layer.cpp \
-	src/base/rs_layerlist.cpp \
-	src/base/rs_leader.cpp \
-	src/base/rs_line.cpp \
-	src/base/rs_linetypepattern.cpp \
-	src/base/rs_math.cpp \
-	src/base/rs_modification.cpp \
+	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 \
+	src/base/filterdxf.cpp \
+	src/base/filterdxf1.cpp \
+	src/base/filterinterface.cpp \
+	src/base/flags.cpp \
+	src/base/font.cpp \
+	src/base/fontlist.cpp \
+	src/base/grid.cpp \
+	src/base/hatch.cpp \
+	src/base/image.cpp \
+	src/base/information.cpp \
+	src/base/infoarea.cpp \
+	src/base/insert.cpp \
+	src/base/layer.cpp \
+	src/base/layerlist.cpp \
+	src/base/leader.cpp \
+	src/base/line.cpp \
+	src/base/linetypepattern.cpp \
+	src/base/mathextra.cpp \
+	src/base/modification.cpp \
 	src/base/paintinterface.cpp \
-	src/base/rs_pattern.cpp \
-	src/base/rs_patternlist.cpp \
-	src/base/rs_pen.cpp \
-	src/base/rs_point.cpp \
-	src/base/rs_polyline.cpp \
-	src/base/rs_preview.cpp \
-	src/base/rs_python.cpp \
-	src/base/rs_python_wrappers.cpp \
-	src/base/rs_script.cpp \
-	src/base/rs_scriptlist.cpp \
-	src/base/rs_selection.cpp \
-	src/base/rs_simplepython.cpp \
-	src/base/rs_snapper.cpp \
-	src/base/rs_solid.cpp \
-	src/base/rs_spline.cpp \
-	src/base/rs_staticgraphicview.cpp \
-	src/base/rs_system.cpp \
-	src/base/rs_text.cpp \
-	src/base/rs_undo.cpp \
-	src/base/rs_undoable.cpp \
-	src/base/rs_undocycle.cpp \
-	src/base/rs_units.cpp \
-	src/base/rs_utility.cpp \
-	src/base/rs_variable.cpp \
-	src/base/rs_variabledict.cpp \
+	src/base/pattern.cpp \
+	src/base/patternlist.cpp \
+	src/base/pen.cpp \
+	src/base/point.cpp \
+	src/base/polyline.cpp \
+	src/base/preview.cpp \
+	src/base/script.cpp \
+	src/base/scriptlist.cpp \
+	src/base/selection.cpp \
+	src/base/solid.cpp \
+	src/base/spline.cpp \
+	src/base/staticgraphicview.cpp \
+	src/base/system.cpp \
+	src/base/text.cpp \
+	src/base/undo.cpp \
+	src/base/undoable.cpp \
+	src/base/undocycle.cpp \
+	src/base/units.cpp \
+	src/base/utility.cpp \
+	src/base/variable.cpp \
+	src/base/variabledict.cpp \
 	src/base/vector.cpp \
 	src/base/vectorsolutions.cpp
 
+#	src/base/snapper.cpp \
+#
+
 HEADERS += \
 	src/actions/actionblocksadd.h \
 	src/actions/actionblocksattributes.h \
@@ -267,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 \
@@ -374,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 \
@@ -460,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 \
@@ -548,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 \