Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3384 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Jan 26, 2005, 2:23:10 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/nico: moved hightmap to importer, there are still some files missing…

Location:
orxonox/branches/nico/src
Files:
1 deleted
5 edited
5 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/nico/src/Makefile.in

    r3383 r3384  
    275275          esac; \
    276276        done; \
    277         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     277        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    278278        cd $(top_srcdir) && \
    279           $(AUTOMAKE) --gnu  src/Makefile
     279          $(AUTOMAKE) --foreign  src/Makefile
    280280.PRECIOUS: Makefile
    281281Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/nico/src/console/Makefile.in

    r3383 r3384  
    193193          esac; \
    194194        done; \
    195         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/console/Makefile'; \
     195        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
    196196        cd $(top_srcdir) && \
    197           $(AUTOMAKE) --gnu  src/console/Makefile
     197          $(AUTOMAKE) --foreign  src/console/Makefile
    198198.PRECIOUS: Makefile
    199199Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/nico/src/gui/Makefile.in

    r3383 r3384  
    220220          esac; \
    221221        done; \
    222         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gui/Makefile'; \
     222        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
    223223        cd $(top_srcdir) && \
    224           $(AUTOMAKE) --gnu  src/gui/Makefile
     224          $(AUTOMAKE) --foreign  src/gui/Makefile
    225225.PRECIOUS: Makefile
    226226Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/nico/src/importer/Makefile.am

    r3238 r3384  
    55
    66
    7 bin_PROGRAMS=importer
     7bin_PROGRAMS=importer heightmap
    88importer_SOURCES= framework.cc \
    99                  windowHandler.cc \
    … …  
    1111                  array.cc \
    1212                  material.cc \
    13                   vector.cc
     13                  vector.cc
     14heightmap_SOURCES= main.cc \
     15                   heightMapTerrain.cc \
     16                   heightMapViewer.cc
    1417
    1518noinst_HEADERS= framework.h \

  • orxonox/branches/nico/src/importer/Makefile.in

    r3383 r3384  
    1616
    1717
    18 SOURCES = $(importer_SOURCES)
     18SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 bin_PROGRAMS = importer$(EXEEXT)
     41bin_PROGRAMS = importer$(EXEEXT) heightmap$(EXEEXT)
    4242subdir = src/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
     55am_heightmap_OBJECTS = main.$(OBJEXT) heightMapTerrain.$(OBJEXT) \
     56        heightMapViewer.$(OBJEXT)
     57heightmap_OBJECTS = $(am_heightmap_OBJECTS)
     58heightmap_LDADD = $(LDADD)
    5559am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
    5660        object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
    … …  
    6266am__depfiles_maybe = depfiles
    6367@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/heightMapTerrain.Po \
     69@AMDEP_TRUE@    ./$(DEPDIR)/heightMapViewer.Po ./$(DEPDIR)/main.Po \
    6470@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
    6571@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
    … …  
    6975CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    7076        -o $@
    71 SOURCES = $(importer_SOURCES)
    72 DIST_SOURCES = $(importer_SOURCES)
     77SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
     78DIST_SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
    7379HEADERS = $(noinst_HEADERS)
    7480ETAGS = etags
    … …  
    179185                  array.cc \
    180186                  material.cc \
    181                   vector.cc
     187                  vector.cc
     188
     189heightmap_SOURCES = main.cc \
     190                   heightMapTerrain.cc \
     191                   heightMapViewer.cc
    182192
    183193noinst_HEADERS = framework.h \
    … …  
    200210          esac; \
    201211        done; \
    202         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/importer/Makefile'; \
     212        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
    203213        cd $(top_srcdir) && \
    204           $(AUTOMAKE) --gnu  src/importer/Makefile
     214          $(AUTOMAKE) --foreign  src/importer/Makefile
    205215.PRECIOUS: Makefile
    206216Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    243253clean-binPROGRAMS:
    244254        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
     255heightmap$(EXEEXT): $(heightmap_OBJECTS) $(heightmap_DEPENDENCIES)
     256        @rm -f heightmap$(EXEEXT)
     257        $(CXXLINK) $(heightmap_LDFLAGS) $(heightmap_OBJECTS) $(heightmap_LDADD) $(LIBS)
    245258importer$(EXEEXT): $(importer_OBJECTS) $(importer_DEPENDENCIES)
    246259        @rm -f importer$(EXEEXT)
    … …  
    255268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
    256269@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.Po@am__quote@
     270@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heightMapTerrain.Po@am__quote@
     271@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heightMapViewer.Po@am__quote@
     272@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
    257273@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
    258274@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@

  • orxonox/branches/nico/src/importer/heightMapTerrain.h

    r3383 r3384  
    1111using namespace std;
    1212
    13 #include "SDL.h"
    14 #include <GLUT/glut.h>
     13#include "../stdincl.h"
    1514
    1615#include "vector.h"

  • orxonox/branches/nico/src/importer/heightMapViewer.h

    r3383 r3384  
    1313#include "heightMapTerrain.h"
    1414
    15 #include "windowhandler.h"
     15#include "windowHandler.h"
    1616#include "vector.h"
    1717
    18 #include "SDL.h"
    19 #include <GLUT/glut.h>
    20 
     18#include "../stdincl.h"
    2119
    2220#define WIDTH        640

  • orxonox/branches/nico/src/importer/main.cc

    r3383 r3384  
    33
    44#include "heightMapViewer.h"
    5 
    6 #include "SDL.h"
    75
    86
Note: See TracChangeset for help on using the changeset viewer.