Changeset 7608 in orxonox.OLD for branches/qt_gui/src/lib/BuildLibs.am

Timestamp:

May 12, 2006, 10:43:53 AM (18 years ago)

Author:

bensch

Message:

merged the old qt-gui back with
svn merge -r7438:HEAD ​https://svn.orxonox.net/orxonox/branches/qt_gui_old .
minor conflict in BuildLibs.am

File:

• branches/qt_gui/src/lib/BuildLibs.am (modified) (1 diff)

branches/qt_gui/src/lib/BuildLibs.am

@@ -3 +3 @@
                 $(LIB_PREFIX)/libORXlibs.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
-                $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \
+                $(LIB_PREFIX)/gui/gtk_gui/libORXgtkgui.a \
+                $(LIB_PREFIX)/gui/qt_gui/libORXqtgui.a \
                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
+                $(LIB_PREFIX)/gui/libORXbasegui.a \
                 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \
                 $(LIB_PREFIX)/graphics/libORXgraphics.a \