Changeset 4427 in orxonox.OLD for orxonox/trunk/src/lib/gui

Timestamp:

May 31, 2005, 10:18:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the gui to a more usefull directory

Location:

orxonox/trunk/src/lib/gui

Files:

• Makefile.am (moved) (moved from orxonox/trunk/src/lib/gui/gui/Makefile.am) (1 diff)
• Makefile.in (moved) (moved from orxonox/trunk/src/lib/gui/gui/Makefile.in) (4 diffs)
• banner.xpm (moved) (moved from orxonox/trunk/src/lib/gui/gui/banner.xpm)
• gui.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui.cc)
• gui.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui.h)
• gui_audio.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_audio.cc)
• gui_audio.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_audio.h)
• gui_banner.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_banner.cc)
• gui_banner.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_banner.h)
• gui_element.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_element.cc)
• gui_element.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_element.h)
• gui_exec.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_exec.cc)
• gui_exec.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_exec.h)
• gui_flags.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_flags.cc)
• gui_flags.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_flags.h)
• gui_gtk.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_gtk.cc)
• gui_gtk.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_gtk.h)
• gui_keys.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_keys.cc)
• gui_keys.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_keys.h)
• gui_update.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_update.cc)
• gui_update.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_update.h)
• gui_video.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_video.cc)
• gui_video.h (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_video.h)
• logo.xpm (moved) (moved from orxonox/trunk/src/lib/gui/gui/logo.xpm)
• rc (moved) (moved from orxonox/trunk/src/lib/gui/gui/rc)

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

@@ -1 @@
-MAINSRCDIR=../../..
+MAINSRCDIR=../..
 AM_CXXFLAGS=-I$(MAINSRCDIR)
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities

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

@@ -24 +24 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
@@ -39 +39 @@
 POST_UNINSTALL = :
 host_triplet = @host@
-subdir = src/lib/gui/gui
+subdir = src/lib/gui
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
@@ -196 +196 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-MAINSRCDIR = ../../..
+MAINSRCDIR = ../..
 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
 AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
@@ -242 +242 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status