Changes in src/UIElements/Makefile.am [e06820:5b991a]

File:

• src/UIElements/Makefile.am (modified) (6 diffs)

src/UIElements/Makefile.am

@@ -167 +167 @@
   UIElements/Views/Qt4/QtInfoBox.cpp \
   UIElements/Views/Qt4/QtMoleculeList.cpp \
+  UIElements/Views/Qt4/QtShapeController.cpp \
+  UIElements/Views/Qt4/QtShapeList.cpp \
   UIElements/Views/Qt4/QtStatusBar.cpp \
   UIElements/Views/Qt4/QtToolBar.cpp \
@@ -174 +176 @@
         UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp \
         UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp \
-        UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.cpp
+        UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.cpp \
+        UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.cpp
 #  UIElements/Views/Qt4/dialoglight.cpp
              
@@ -185 +188 @@
   UIElements/Views/Qt4/QtInfoBox.hpp \
   UIElements/Views/Qt4/QtMoleculeList.hpp \
+  UIElements/Views/Qt4/QtShapeController.hpp \
+  UIElements/Views/Qt4/QtShapeList.hpp \
   UIElements/Views/Qt4/QtStatusBar.hpp \
   UIElements/Views/Qt4/QtToolBar.hpp \
@@ -192 +197 @@
         UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp \
         UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp \
-        UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp
+        UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp \
+        UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.hpp
 
 QTUIUI_UIFILES = \
@@ -247 +253 @@
 endif
 libMolecuilderUI_la_LIBADD += \
-        libMolecuilderFragmentationSummation.la \
-        libMolecuilderFragmentationSetValues.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
@@ -303 +307 @@
 
 libMolecuilderQtUI_la_LIBADD = \
+        ../data/icons/liblogo.la \
         ${QT_LIBS} \
         -lQtOpenGL \
         ${GLU_LIBS}
+
+##libMolecuilderQtUI_la_LDADD = \
+##      ../data/icons/liblogo.a
 
 nobase_libMolecuilderQtUI_la_include_HEADERS = ${QTUIHEADER} $(QTUIUI_UIFILES)