Changeset 7919 in orxonox.OLD for trunk/src/lib/gui/gl_gui/Makefile.am

Timestamp:

May 28, 2006, 3:48:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/lib/gui/gl_gui/Makefile.am (modified) (2 diffs)

trunk/src/lib/gui/gl_gui/Makefile.am

@@ -9 +9 @@
 
 
-libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
-                        glgui_handler.cc \
-                        signal_connector.cc \
-                        glgui_mainwidget.cc \
-                        glgui_widget.cc \
-                        glgui_button.cc \
-                        glgui_pushbutton.cc \
-                        glgui_container.cc \
-                        glgui_bar.cc \
-                        glgui_box.cc \
-                        glgui_frame.cc \
-                        glgui_window.cc
+libORXglgui_a_SOURCES = \
+                glmenu/glmenu_imagescreen.cc \
+                glgui_handler.cc \
+                signal_connector.cc \
+                glgui_mainwidget.cc \
+                glgui_widget.cc \
+                glgui_button.cc \
+                glgui_pushbutton.cc \
+                glgui_checkbutton.cc \
+                glgui_slider.cc \
+                glgui_container.cc \
+                glgui_bar.cc \
+                glgui_box.cc \
+                glgui_frame.cc \
+                glgui_inputline.cc \
+                glgui_textfield.cc \
+                glgui_window.cc \
+                glgui_cursor.cc
 
 
-noinst_HEADERS= glmenu/glmenu_imagescreen.h \
+noinst_HEADERS= \
+                glmenu/glmenu_imagescreen.h \
                 signal_connector.h \
                 glgui.h \
+                glgui_defs.h \
                 glgui_handler.h \
                 glgui_mainwidget.h \
@@ -31 +39 @@
                 glgui_button.h \
                 glgui_pushbutton.h \
+                glgui_checkbutton.h \
+                glgui_slider.h \
                 glgui_container.h \
                 glgui_bar.h \
                 glgui_box.h \
                 glgui_frame.h \
-                glgui_window.h
+                glgui_inputline.h \
+                glgui_textfield.h \
+                glgui_window.h \
+                glgui_cursor.h