Changeset 3384 in orxonox.OLD for orxonox/branches/nico/src
- Timestamp:
- Jan 26, 2005, 2:23:10 PM (20 years ago)
- Location:
- orxonox/branches/nico/src
- Files:
-
- 1 deleted
- 5 edited
- 5 copied
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/nico/src/Makefile.in
r3383 r3384 275 275 esac; \ 276 276 done; \ 277 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \277 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 278 278 cd $(top_srcdir) && \ 279 $(AUTOMAKE) -- gnusrc/Makefile279 $(AUTOMAKE) --foreign src/Makefile 280 280 .PRECIOUS: Makefile 281 281 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/nico/src/console/Makefile.in
r3383 r3384 193 193 esac; \ 194 194 done; \ 195 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/console/Makefile'; \195 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/console/Makefile'; \ 196 196 cd $(top_srcdir) && \ 197 $(AUTOMAKE) -- gnusrc/console/Makefile197 $(AUTOMAKE) --foreign src/console/Makefile 198 198 .PRECIOUS: Makefile 199 199 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/nico/src/gui/Makefile.in
r3383 r3384 220 220 esac; \ 221 221 done; \ 222 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/gui/Makefile'; \222 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gui/Makefile'; \ 223 223 cd $(top_srcdir) && \ 224 $(AUTOMAKE) -- gnusrc/gui/Makefile224 $(AUTOMAKE) --foreign src/gui/Makefile 225 225 .PRECIOUS: Makefile 226 226 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/nico/src/importer/Makefile.am
r3238 r3384 5 5 6 6 7 bin_PROGRAMS=importer 7 bin_PROGRAMS=importer heightmap 8 8 importer_SOURCES= framework.cc \ 9 9 windowHandler.cc \ … … 11 11 array.cc \ 12 12 material.cc \ 13 vector.cc 13 vector.cc 14 heightmap_SOURCES= main.cc \ 15 heightMapTerrain.cc \ 16 heightMapViewer.cc 14 17 15 18 noinst_HEADERS= framework.h \ -
orxonox/branches/nico/src/importer/Makefile.in
r3383 r3384 16 16 17 17 18 SOURCES = $( importer_SOURCES)18 SOURCES = $(heightmap_SOURCES) $(importer_SOURCES) 19 19 20 20 srcdir = @srcdir@ … … 39 39 POST_UNINSTALL = : 40 40 host_triplet = @host@ 41 bin_PROGRAMS = importer$(EXEEXT) 41 bin_PROGRAMS = importer$(EXEEXT) heightmap$(EXEEXT) 42 42 subdir = src/importer 43 43 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ … … 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) 55 am_heightmap_OBJECTS = main.$(OBJEXT) heightMapTerrain.$(OBJEXT) \ 56 heightMapViewer.$(OBJEXT) 57 heightmap_OBJECTS = $(am_heightmap_OBJECTS) 58 heightmap_LDADD = $(LDADD) 55 59 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \ 56 60 object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \ … … 62 66 am__depfiles_maybe = depfiles 63 67 @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 \ 64 70 @AMDEP_TRUE@ ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \ 65 71 @AMDEP_TRUE@ ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po … … 69 75 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 70 76 -o $@ 71 SOURCES = $( importer_SOURCES)72 DIST_SOURCES = $( importer_SOURCES)77 SOURCES = $(heightmap_SOURCES) $(importer_SOURCES) 78 DIST_SOURCES = $(heightmap_SOURCES) $(importer_SOURCES) 73 79 HEADERS = $(noinst_HEADERS) 74 80 ETAGS = etags … … 179 185 array.cc \ 180 186 material.cc \ 181 vector.cc 187 vector.cc 188 189 heightmap_SOURCES = main.cc \ 190 heightMapTerrain.cc \ 191 heightMapViewer.cc 182 192 183 193 noinst_HEADERS = framework.h \ … … 200 210 esac; \ 201 211 done; \ 202 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/importer/Makefile'; \212 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/importer/Makefile'; \ 203 213 cd $(top_srcdir) && \ 204 $(AUTOMAKE) -- gnusrc/importer/Makefile214 $(AUTOMAKE) --foreign src/importer/Makefile 205 215 .PRECIOUS: Makefile 206 216 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 243 253 clean-binPROGRAMS: 244 254 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) 255 heightmap$(EXEEXT): $(heightmap_OBJECTS) $(heightmap_DEPENDENCIES) 256 @rm -f heightmap$(EXEEXT) 257 $(CXXLINK) $(heightmap_LDFLAGS) $(heightmap_OBJECTS) $(heightmap_LDADD) $(LIBS) 245 258 importer$(EXEEXT): $(importer_OBJECTS) $(importer_DEPENDENCIES) 246 259 @rm -f importer$(EXEEXT) … … 255 268 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ 256 269 @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@ 257 273 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@ 258 274 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@ -
orxonox/branches/nico/src/importer/heightMapTerrain.h
r3383 r3384 11 11 using namespace std; 12 12 13 #include "SDL.h" 14 #include <GLUT/glut.h> 13 #include "../stdincl.h" 15 14 16 15 #include "vector.h" -
orxonox/branches/nico/src/importer/heightMapViewer.h
r3383 r3384 13 13 #include "heightMapTerrain.h" 14 14 15 #include "window handler.h"15 #include "windowHandler.h" 16 16 #include "vector.h" 17 17 18 #include "SDL.h" 19 #include <GLUT/glut.h> 20 18 #include "../stdincl.h" 21 19 22 20 #define WIDTH 640 -
orxonox/branches/nico/src/importer/main.cc
r3383 r3384 3 3 4 4 #include "heightMapViewer.h" 5 6 #include "SDL.h"7 5 8 6
Note: See TracChangeset
for help on using the changeset viewer.