Changeset 3384 in orxonox.OLD for orxonox/branches/nico/src/importer

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/importer

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (9 diffs)
• heightMapTerrain.cc (copied) (copied from orxonox/branches/nico/src/heightmap/heightMapTerrain.cc)
• heightMapTerrain.h (copied) (copied from orxonox/branches/nico/src/heightmap/heightMapTerrain.h) (1 diff)
• heightMapViewer.cc (copied) (copied from orxonox/branches/nico/src/heightmap/heightMapViewer.cc)
• heightMapViewer.h (copied) (copied from orxonox/branches/nico/src/heightmap/heightMapViewer.h) (1 diff)
• main.cc (copied) (copied from orxonox/branches/nico/src/heightmap/main.cc) (1 diff)

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

@@ -5 +5 @@
 
 
-bin_PROGRAMS=importer
+bin_PROGRAMS=importer heightmap
 importer_SOURCES= framework.cc \
                   windowHandler.cc \
@@ -11 +11 @@
                   array.cc \
                   material.cc \
-                  vector.cc 
+                  vector.cc
+heightmap_SOURCES= main.cc \
+                   heightMapTerrain.cc \
+                   heightMapViewer.cc
 
 noinst_HEADERS= framework.h \

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

@@ -16 +16 @@
 
 
-SOURCES = $(importer_SOURCES)
+SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
 
 srcdir = @srcdir@
@@ -39 +39 @@
 POST_UNINSTALL = :
 host_triplet = @host@
-bin_PROGRAMS = importer$(EXEEXT)
+bin_PROGRAMS = importer$(EXEEXT) heightmap$(EXEEXT)
 subdir = src/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -53 +53 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
+am_heightmap_OBJECTS = main.$(OBJEXT) heightMapTerrain.$(OBJEXT) \
+        heightMapViewer.$(OBJEXT)
+heightmap_OBJECTS = $(am_heightmap_OBJECTS)
+heightmap_LDADD = $(LDADD)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
         object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
@@ -62 +66 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/heightMapTerrain.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/heightMapViewer.Po ./$(DEPDIR)/main.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
@@ -69 +75 @@
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
         -o $@
-SOURCES = $(importer_SOURCES)
-DIST_SOURCES = $(importer_SOURCES)
+SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
+DIST_SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -179 +185 @@
                   array.cc \
                   material.cc \
-                  vector.cc 
+                  vector.cc
+
+heightmap_SOURCES = main.cc \
+                   heightMapTerrain.cc \
+                   heightMapViewer.cc
 
 noinst_HEADERS = framework.h \
@@ -200 +210 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/importer/Makefile
+          $(AUTOMAKE) --foreign  src/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -243 +253 @@
 clean-binPROGRAMS:
         -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+heightmap$(EXEEXT): $(heightmap_OBJECTS) $(heightmap_DEPENDENCIES) 
+        @rm -f heightmap$(EXEEXT)
+        $(CXXLINK) $(heightmap_LDFLAGS) $(heightmap_OBJECTS) $(heightmap_LDADD) $(LIBS)
 importer$(EXEEXT): $(importer_OBJECTS) $(importer_DEPENDENCIES) 
         @rm -f importer$(EXEEXT)
@@ -255 +268 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heightMapTerrain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heightMapViewer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@

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

@@ -11 +11 @@
 using namespace std;
 
-#include "SDL.h"
-#include <GLUT/glut.h>
+#include "../stdincl.h"
 
 #include "vector.h"

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

@@ -13 +13 @@
 #include "heightMapTerrain.h"
 
-#include "windowhandler.h"
+#include "windowHandler.h"
 #include "vector.h"
 
-#include "SDL.h"
-#include <GLUT/glut.h>
-
+#include "../stdincl.h"
 
 #define WIDTH        640

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

@@ -3 +3 @@
 
 #include "heightMapViewer.h"
-
-#include "SDL.h"