Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3196 in orxonox.OLD


Ignore:
Timestamp:
Dec 17, 2004, 12:17:52 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: moved importer into the Trunk, now no merging is needed anymore.

Location:
orxonox/trunk
Files:
6 deleted
14 edited
1 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.am

    r3191 r3196  
    11AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
    22
    3 SUBDIRS = src \
    4           importer
     3SUBDIRS = src
     4
    55
    66
    … …  
    1010##
    1111
    12 DOXYGEN_INPUT = src src/gui
     12DOXYGEN_INPUT = "src src/gui src/importer"
    1313
    1414## Exclude the application wizard templates, and some file templates

  • orxonox/trunk/Makefile.in

    r3191 r3196  
    166166target_vendor = @target_vendor@
    167167AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
    168 SUBDIRS = src \
    169           importer
    170 
    171 DOXYGEN_INPUT = src src/gui
     168SUBDIRS = src
     169DOXYGEN_INPUT = "src src/gui src/importer"
    172170DOXYGEN_EXCLUDE =
    173171DOXYGEN_EXAMPLE_PATH =

  • orxonox/trunk/configure

    r3191 r3196  
    75457545
    75467546
    7547                                                   ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile importer/Makefile"
     7547                                                  ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
    75487548
    75497549cat >confcache <<\_ACEOF
    … …  
    81148114  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
    81158115  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    8116   "importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES importer/Makefile" ;;
     8116  "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
    81178117  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    81188118  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

  • orxonox/trunk/configure.ac

    r3191 r3196  
    353353                 src/gui/Makefile
    354354                 src/Makefile
    355                  importer/Makefile])
     355                 src/importer/Makefile])
    356356AC_OUTPUT

  • orxonox/trunk/src/Makefile.am

    r3191 r3196  
    2323                 campaign.cc \
    2424                 story_entity.cc \
    25                  object.cc \
     25                 importer/object.cc \
    2626                 environment.cc \
    27                  array.cc \
    28                  material.cc \
     27                 importer/array.cc \
     28                 importer/material.cc \
    2929                 list.cc
    3030
    … …  
    5656                 message_structures.h \
    5757                 shoot_rocket.h \
    58                  object.h \
    59                  array.h \
    60                  material.h \
    6158                 list_template.h \
    6259                 story_entity.h \
    … …  
    7269endif
    7370
    74 SUBDIRS = gui \
     71SUBDIRS = importer \
     72          gui \
    7573          $(GTK_PROGS)
    7674

  • orxonox/trunk/src/Makefile.in

    r3191 r3196  
    9595ETAGS = etags
    9696CTAGS = ctags
    97 DIST_SUBDIRS = gui console
     97DIST_SUBDIRS = importer gui console
    9898DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9999ACLOCAL = @ACLOCAL@
    … …  
    209209                 campaign.cc \
    210210                 story_entity.cc \
    211                  object.cc \
     211                 importer/object.cc \
    212212                 environment.cc \
    213                  array.cc \
    214                  material.cc \
     213                 importer/array.cc \
     214                 importer/material.cc \
    215215                 list.cc
    216216
    … …  
    242242                 message_structures.h \
    243243                 shoot_rocket.h \
    244                  object.h \
    245                  array.h \
    246                  material.h \
    247244                 list_template.h \
    248245                 story_entity.h \
    … …  
    253250@HAVE_GTK2_FALSE@GTK_PROGS =
    254251@HAVE_GTK2_TRUE@GTK_PROGS = console
    255 SUBDIRS = gui \
     252SUBDIRS = importer \
     253          gui \
    256254          $(GTK_PROGS)
    257255
    … …  
    359357@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    360358@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     359
     360object.o: importer/object.cc
     361@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.o -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc; \
     362@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi
     363@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/object.cc' object='object.o' libtool=no @AMDEPBACKSLASH@
     364@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' @AMDEPBACKSLASH@
     365@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     366@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc
     367
     368object.obj: importer/object.cc
     369@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.obj -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`; \
     370@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi
     371@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/object.cc' object='object.obj' libtool=no @AMDEPBACKSLASH@
     372@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' @AMDEPBACKSLASH@
     373@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     374@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`
     375
     376array.o: importer/array.cc
     377@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.o -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc; \
     378@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
     379@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@
     380@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     381@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     382@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc
     383
     384array.obj: importer/array.cc
     385@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.obj -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi`; \
     386@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
     387@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@
     388@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     389@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     390@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi`
     391
     392material.o: importer/material.cc
     393@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.o -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc; \
     394@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
     395@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@
     396@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     397@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     398@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc
     399
     400material.obj: importer/material.cc
     401@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.obj -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`; \
     402@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
     403@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@
     404@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     405@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     406@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`
    361407uninstall-info-am:
    362408

  • orxonox/trunk/src/importer/Makefile.in

    r3186 r3196  
    2424pkglibdir = $(libdir)/@PACKAGE@
    2525pkgincludedir = $(includedir)/@PACKAGE@
    26 top_builddir = ..
     26top_builddir = ../..
    2727am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2828INSTALL = @INSTALL@
    … …  
    4040host_triplet = @host@
    4141bin_PROGRAMS = importer$(EXEEXT)
    42 subdir = importer
     42subdir = src/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4444        $(srcdir)/Makefile.in
    … …  
    199199          esac; \
    200200        done; \
    201         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  importer/Makefile'; \
     201        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
    202202        cd $(top_srcdir) && \
    203           $(AUTOMAKE) --foreign  importer/Makefile
     203          $(AUTOMAKE) --foreign  src/importer/Makefile
    204204.PRECIOUS: Makefile
    205205Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/importer/array.h

    r3186 r3196  
    1111extern int verbose; //!< will be obsolete soon
    1212
    13 #include "stdincl.h"
     13#include "../stdincl.h"
    1414#include <fstream>
    1515

  • orxonox/trunk/src/importer/framework.cc

    r3140 r3196  
    1616#include "framework.h"
    1717
    18 int verbose = 2;
    1918
    2019void DrawGLScene()
    … …  
    5352int main(int argc, char *argv[])
    5453{
     54  int verbose = 2;
    5555  Uint8* keys; // This variable will be used in the keyboard routine
    5656  int done=FALSE; // We aren't done yet, are we?

  • orxonox/trunk/src/importer/material.h

    r3186 r3196  
    1313extern int verbose; //!< will be obsolete soon.
    1414
    15 #include "stdincl.h"
     15#include "../stdincl.h"
    1616
    1717#if HAVE_CONFIG_H

  • orxonox/trunk/src/importer/object.cc

    r3195 r3196  
    1515
    1616#include "object.h"
     17int verbose = 1; //! \todo should be GLOBAL
    1718using namespace std;
    1819

  • orxonox/trunk/src/importer/object.h

    r3186 r3196  
    77#define _OBJECT_H
    88
    9 #include "stdincl.h"
     9#include "../stdincl.h"
    1010
    1111#include "array.h"
    … …  
    1616using namespace std;
    1717
    18 extern int verbose; //!< Will be removed and added again as a verbose-class.
    1918
    2019

  • orxonox/trunk/src/importer/windowHandler.h

    r3189 r3196  
    44extern int verbose;
    55
    6 #include "stdincl.h"
     6#include "../stdincl.h"
    77
    88#include <stdarg.h>

  • orxonox/trunk/src/player.h

    r2811 r3196  
    88
    99#include "world_entity.h"
    10 #include "object.h"
     10#include "importer/object.h"
    1111
    1212//! Basic controllable WorldEntity
Note: See TracChangeset for help on using the changeset viewer.