Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/gui


Ignore:
Timestamp:
Mar 18, 2005, 11:52:15 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit :)

Conflits in world.cc are a MESS: fix it

Location:
orxonox/branches/levelloader/src/lib/gui
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/levelloader/src/lib/gui/Makefile.in

    r3563 r3605  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    7878DEFS = @DEFS@
    7979DEPDIR = @DEPDIR@
     80DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     81DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    8082DOXYGEN = @DOXYGEN@
    8183DOXYGEN_FALSE = @DOXYGEN_FALSE@
    … …  
    177179          esac; \
    178180        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
     181        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
    180182        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --gnu  src/lib/gui/Makefile
     183          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
    182184.PRECIOUS: Makefile
    183185Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    272274        tags=; \
    273275        here=`pwd`; \
    274         if (etags --etags-include --version) >/dev/null 2>&1; then \
     276        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    275277          include_option=--etags-include; \
     278          empty_fix=.; \
    276279        else \
    277280          include_option=--include; \
     281          empty_fix=; \
    278282        fi; \
    279283        list='$(SUBDIRS)'; for subdir in $$list; do \
    280284          if test "$$subdir" = .; then :; else \
    281             test -f $$subdir/TAGS && \
     285            test ! -f $$subdir/TAGS || \
    282286              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    283287          fi; \
    … …  
    289293          $(AWK) '    { files[$$0] = 1; } \
    290294               END { for (i in files) print i; }'`; \
    291         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    292           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    293              $$tags $$unique
     295        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     296          test -n "$$unique" || unique=$$empty_fix; \
     297          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     298            $$tags $$unique; \
     299        fi
    294300ctags: CTAGS
    295301CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

  • orxonox/branches/levelloader/src/lib/gui/console/Makefile.in

    r3563 r3605  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    9696DEFS = @DEFS@
    9797DEPDIR = @DEPDIR@
     98DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     99DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    98100DOXYGEN = @DOXYGEN@
    99101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    … …  
    203205          esac; \
    204206        done; \
    205         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
     207        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
    206208        cd $(top_srcdir) && \
    207           $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
     209          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
    208210.PRECIOUS: Makefile
    209211Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    225227install-binPROGRAMS: $(bin_PROGRAMS)
    226228        @$(NORMAL_INSTALL)
    227         $(mkdir_p) $(DESTDIR)$(bindir)
     229        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    228230        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    229231          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    231233          ; then \
    232234            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    233            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    234            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     235           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     236           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    235237          else :; fi; \
    236238        done
    … …  
    240242        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    241243          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    242           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    243           rm -f $(DESTDIR)$(bindir)/$$f; \
     244          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     245          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    244246        done
    245247
    … …  
    297299          $(AWK) '    { files[$$0] = 1; } \
    298300               END { for (i in files) print i; }'`; \
    299         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    300           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    301              $$tags $$unique
     301        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     302          test -n "$$unique" || unique=$$empty_fix; \
     303          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     304            $$tags $$unique; \
     305        fi
    302306ctags: CTAGS
    303307CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    354358all-am: Makefile $(PROGRAMS) $(HEADERS)
    355359installdirs:
    356         $(mkdir_p) $(DESTDIR)$(bindir)
     360        for dir in "$(DESTDIR)$(bindir)"; do \
     361          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     362        done
    357363install: install-am
    358364install-exec: install-exec-am

  • orxonox/branches/levelloader/src/lib/gui/gui/Makefile.in

    r3563 r3605  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    105105DEFS = @DEFS@
    106106DEPDIR = @DEPDIR@
     107DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     108DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    107109DOXYGEN = @DOXYGEN@
    108110DOXYGEN_FALSE = @DOXYGEN_FALSE@
    … …  
    236238          esac; \
    237239        done; \
    238         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
     240        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
    239241        cd $(top_srcdir) && \
    240           $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
     242          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
    241243.PRECIOUS: Makefile
    242244Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    258260install-binPROGRAMS: $(bin_PROGRAMS)
    259261        @$(NORMAL_INSTALL)
    260         $(mkdir_p) $(DESTDIR)$(bindir)
     262        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    261263        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    262264          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    264266          ; then \
    265267            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    266            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    267            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     268           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     269           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    268270          else :; fi; \
    269271        done
    … …  
    273275        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    274276          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    275           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    276           rm -f $(DESTDIR)$(bindir)/$$f; \
     277          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     278          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    277279        done
    278280
    … …  
    336338          $(AWK) '    { files[$$0] = 1; } \
    337339               END { for (i in files) print i; }'`; \
    338         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    339           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    340              $$tags $$unique
     340        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     341          test -n "$$unique" || unique=$$empty_fix; \
     342          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     343            $$tags $$unique; \
     344        fi
    341345ctags: CTAGS
    342346CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    393397all-am: Makefile $(PROGRAMS) $(HEADERS)
    394398installdirs:
    395         $(mkdir_p) $(DESTDIR)$(bindir)
     399        for dir in "$(DESTDIR)$(bindir)"; do \
     400          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     401        done
    396402install: install-am
    397403install-exec: install-exec-am

  • orxonox/branches/levelloader/src/lib/gui/gui/orxonox_gui_gtk.h

    r3499 r3605  
    99#include <config.h>
    1010#endif
    11 
    12 //! verbose level, soon obsolete
    13 extern int verbose; // soon obsolete here
    1411
    1512#include "debug.h"
Note: See TracChangeset for help on using the changeset viewer.