Changeset 4908 in orxonox.OLD for orxonox/trunk/src/subprojects/gui

Timestamp:

Jul 20, 2005, 10:47:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: subprojects (without gui) work again

Location:

orxonox/trunk/src/subprojects/gui

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)

orxonox/trunk/src/subprojects/gui/Makefile.am

@@ -9 +9 @@
 
 gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/libORXgui.a \
-                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
+                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                   $(MAINSRCDIR)/lib/event/libORXevent.a
 
 gui_CPPFLAGS = -DNO_AUDIO -DNO_MODEL -DNO_TEXTURES -DNO_TEXT
@@ -19 +20 @@
 gui_SOURCES= gui_main.cc \
              $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
              $(MAINSRCDIR)/lib/lang/base_object.cc \
              $(MAINSRCDIR)/lib/lang/class_list.cc \

orxonox/trunk/src/subprojects/gui/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_gui_OBJECTS = gui-gui_main.$(OBJEXT) gui-graphics_engine.$(OBJEXT) \
+        gui-render_2d.$(OBJEXT) gui-element_2d.$(OBJEXT) \
         gui-base_object.$(OBJEXT) gui-class_list.$(OBJEXT) \
         gui-vector.$(OBJEXT) gui-resource_manager.$(OBJEXT) \
@@ -65 +66 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gui-base_object.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-class_list.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/gui-element_2d.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-gui_main.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-ini_parser.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-load_param.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/gui-render_2d.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-resource_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-substring.Po \
@@ -194 +197 @@
 AM_LDFLAGS = $(MWINDOWS)
 gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/libORXgui.a \
-                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
+                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                   $(MAINSRCDIR)/lib/event/libORXevent.a
 
 gui_CPPFLAGS = -DNO_AUDIO -DNO_MODEL -DNO_TEXTURES -DNO_TEXT
@@ -203 +207 @@
 gui_SOURCES = gui_main.cc \
              $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
              $(MAINSRCDIR)/lib/lang/base_object.cc \
              $(MAINSRCDIR)/lib/lang/class_list.cc \
@@ -280 +286 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-class_list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-gui_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-load_param.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-substring.Po@am__quote@
@@ -335 +343 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
+
+gui-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-render_2d.o -MD -MP -MF "$(DEPDIR)/gui-render_2d.Tpo" -c -o gui-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-render_2d.Tpo" "$(DEPDIR)/gui-render_2d.Po"; else rm -f "$(DEPDIR)/gui-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='gui-render_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-render_2d.Po' tmpdepfile='$(DEPDIR)/gui-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+
+gui-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-render_2d.obj -MD -MP -MF "$(DEPDIR)/gui-render_2d.Tpo" -c -o gui-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-render_2d.Tpo" "$(DEPDIR)/gui-render_2d.Po"; else rm -f "$(DEPDIR)/gui-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='gui-render_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-render_2d.Po' tmpdepfile='$(DEPDIR)/gui-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
+
+gui-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-element_2d.o -MD -MP -MF "$(DEPDIR)/gui-element_2d.Tpo" -c -o gui-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-element_2d.Tpo" "$(DEPDIR)/gui-element_2d.Po"; else rm -f "$(DEPDIR)/gui-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='gui-element_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-element_2d.Po' tmpdepfile='$(DEPDIR)/gui-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+
+gui-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-element_2d.obj -MD -MP -MF "$(DEPDIR)/gui-element_2d.Tpo" -c -o gui-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-element_2d.Tpo" "$(DEPDIR)/gui-element_2d.Po"; else rm -f "$(DEPDIR)/gui-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='gui-element_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-element_2d.Po' tmpdepfile='$(DEPDIR)/gui-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
 
 gui-base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc