Changeset 5160 in orxonox.OLD
- Timestamp:
- Sep 5, 2005, 8:12:38 AM (19 years ago)
- Location:
- trunk
- Files:
-
- 23 edited
- 2 copied
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure
r5158 r5160 9446 9446 ## OUTPUT CONFIGURE ## 9447 9447 ###################### 9448 ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/graphics/spatial_separation/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile"9448 ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/graphics/spatial_separation/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/shell/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile" 9449 9449 9450 9450 … … 10051 10051 "src/lib/particles/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/particles/Makefile" ;; 10052 10052 "src/lib/collision_detection/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/collision_detection/Makefile" ;; 10053 "src/lib/shell/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/shell/Makefile" ;; 10053 10054 "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;; 10054 10055 "src/lib/tinyxml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/tinyxml/Makefile" ;; -
trunk/configure.ac
r5158 r5160 635 635 src/lib/particles/Makefile 636 636 src/lib/collision_detection/Makefile 637 src/lib/shell/Makefile 637 638 src/lib/gui/Makefile 638 639 src/lib/tinyxml/Makefile -
trunk/orxonox.kdevelop
r5159 r5160 140 140 </kdevcppsupport> 141 141 <kdevfileview> 142 <groups> 143 <hidenonprojectfiles>false</hidenonprojectfiles> 144 <hidenonlocation>false</hidenonlocation> 145 </groups> 142 <groups/> 146 143 <tree> 147 144 <hidepatterns>*.o,*.lo,*~,*in</hidepatterns> … … 157 154 <kdevdocumentation> 158 155 <projectdoc> 159 <docsystem ></docsystem>160 <docurl ></docurl>161 <usermanualurl ></usermanualurl>156 <docsystem/> 157 <docurl/> 158 <usermanualurl/> 162 159 </projectdoc> 163 160 </kdevdocumentation> -
trunk/src/Makefile.am
r5141 r5160 18 18 lib/collision_detection/libORXcd.a \ 19 19 lib/graphics/spatial_separation/libORXquadtree.a \ 20 lib/tinyxml/libtinyxml.a 20 lib/tinyxml/libtinyxml.a \ 21 lib/shell/libORXshell.a 21 22 22 23 orxonox_LDADD = lib/gui/libORXgui.a \ … … 29 30 lib/graphics/spatial_separation/libORXquadtree.a \ 30 31 lib/tinyxml/libtinyxml.a \ 32 lib/shell/libORXshell.a \ 31 33 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 32 34 33 35 34 36 orxonox_SOURCES = orxonox.cc \ 35 util/shell.cc \36 util/shell_command.cc \37 37 util/loading/game_loader.cc \ 38 38 util/track/track_manager.cc \ … … 102 102 util/garbage_collector.h \ 103 103 util/state.h \ 104 util/shell.h \105 util/shell_command.h \106 104 util/user_control.h \ 107 105 util/resource_manager.h \ -
trunk/src/Makefile.in
r5141 r5160 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) 55 am_orxonox_OBJECTS = orxonox-orxonox.$(OBJEXT) orxonox-shell.$(OBJEXT) \ 56 orxonox-shell_command.$(OBJEXT) orxonox-game_loader.$(OBJEXT) \ 57 orxonox-track_manager.$(OBJEXT) orxonox-track_node.$(OBJEXT) \ 58 orxonox-pilot_node.$(OBJEXT) orxonox-animation.$(OBJEXT) \ 59 orxonox-animation3d.$(OBJEXT) \ 55 am_orxonox_OBJECTS = orxonox-orxonox.$(OBJEXT) \ 56 orxonox-game_loader.$(OBJEXT) orxonox-track_manager.$(OBJEXT) \ 57 orxonox-track_node.$(OBJEXT) orxonox-pilot_node.$(OBJEXT) \ 58 orxonox-animation.$(OBJEXT) orxonox-animation3d.$(OBJEXT) \ 60 59 orxonox-animation_player.$(OBJEXT) \ 61 60 orxonox-fast_factory.$(OBJEXT) \ … … 123 122 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-resource_manager.Po \ 124 123 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-satellite.Po \ 125 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-shell.Po \126 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-shell_command.Po \127 124 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-skybox.Po \ 128 125 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-skysphere.Po \ … … 280 277 lib/collision_detection/libORXcd.a \ 281 278 lib/graphics/spatial_separation/libORXquadtree.a \ 282 lib/tinyxml/libtinyxml.a 279 lib/tinyxml/libtinyxml.a \ 280 lib/shell/libORXshell.a 283 281 284 282 orxonox_LDADD = lib/gui/libORXgui.a \ … … 291 289 lib/graphics/spatial_separation/libORXquadtree.a \ 292 290 lib/tinyxml/libtinyxml.a \ 291 lib/shell/libORXshell.a \ 293 292 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 294 293 295 294 orxonox_SOURCES = orxonox.cc \ 296 util/shell.cc \297 util/shell_command.cc \298 295 util/loading/game_loader.cc \ 299 296 util/track/track_manager.cc \ … … 363 360 util/garbage_collector.h \ 364 361 util/state.h \ 365 util/shell.h \366 util/shell_command.h \367 362 util/user_control.h \ 368 363 util/resource_manager.h \ … … 449 444 esac; \ 450 445 done; \ 451 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \446 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 452 447 cd $(top_srcdir) && \ 453 $(AUTOMAKE) -- gnusrc/Makefile448 $(AUTOMAKE) --foreign src/Makefile 454 449 .PRECIOUS: Makefile 455 450 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 536 531 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-resource_manager.Po@am__quote@ 537 532 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-satellite.Po@am__quote@ 538 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-shell.Po@am__quote@539 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-shell_command.Po@am__quote@540 533 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-skybox.Po@am__quote@ 541 534 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-skysphere.Po@am__quote@ … … 589 582 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 590 583 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-orxonox.obj `if test -f 'orxonox.cc'; then $(CYGPATH_W) 'orxonox.cc'; else $(CYGPATH_W) '$(srcdir)/orxonox.cc'; fi` 591 592 orxonox-shell.o: util/shell.cc593 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-shell.o -MD -MP -MF "$(DEPDIR)/orxonox-shell.Tpo" -c -o orxonox-shell.o `test -f 'util/shell.cc' || echo '$(srcdir)/'`util/shell.cc; \594 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-shell.Tpo" "$(DEPDIR)/orxonox-shell.Po"; else rm -f "$(DEPDIR)/orxonox-shell.Tpo"; exit 1; fi595 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/shell.cc' object='orxonox-shell.o' libtool=no @AMDEPBACKSLASH@596 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-shell.Po' tmpdepfile='$(DEPDIR)/orxonox-shell.TPo' @AMDEPBACKSLASH@597 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@598 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-shell.o `test -f 'util/shell.cc' || echo '$(srcdir)/'`util/shell.cc599 600 orxonox-shell.obj: util/shell.cc601 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-shell.obj -MD -MP -MF "$(DEPDIR)/orxonox-shell.Tpo" -c -o orxonox-shell.obj `if test -f 'util/shell.cc'; then $(CYGPATH_W) 'util/shell.cc'; else $(CYGPATH_W) '$(srcdir)/util/shell.cc'; fi`; \602 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-shell.Tpo" "$(DEPDIR)/orxonox-shell.Po"; else rm -f "$(DEPDIR)/orxonox-shell.Tpo"; exit 1; fi603 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/shell.cc' object='orxonox-shell.obj' libtool=no @AMDEPBACKSLASH@604 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-shell.Po' tmpdepfile='$(DEPDIR)/orxonox-shell.TPo' @AMDEPBACKSLASH@605 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@606 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-shell.obj `if test -f 'util/shell.cc'; then $(CYGPATH_W) 'util/shell.cc'; else $(CYGPATH_W) '$(srcdir)/util/shell.cc'; fi`607 608 orxonox-shell_command.o: util/shell_command.cc609 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-shell_command.o -MD -MP -MF "$(DEPDIR)/orxonox-shell_command.Tpo" -c -o orxonox-shell_command.o `test -f 'util/shell_command.cc' || echo '$(srcdir)/'`util/shell_command.cc; \610 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-shell_command.Tpo" "$(DEPDIR)/orxonox-shell_command.Po"; else rm -f "$(DEPDIR)/orxonox-shell_command.Tpo"; exit 1; fi611 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/shell_command.cc' object='orxonox-shell_command.o' libtool=no @AMDEPBACKSLASH@612 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-shell_command.Po' tmpdepfile='$(DEPDIR)/orxonox-shell_command.TPo' @AMDEPBACKSLASH@613 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@614 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-shell_command.o `test -f 'util/shell_command.cc' || echo '$(srcdir)/'`util/shell_command.cc615 616 orxonox-shell_command.obj: util/shell_command.cc617 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-shell_command.obj -MD -MP -MF "$(DEPDIR)/orxonox-shell_command.Tpo" -c -o orxonox-shell_command.obj `if test -f 'util/shell_command.cc'; then $(CYGPATH_W) 'util/shell_command.cc'; else $(CYGPATH_W) '$(srcdir)/util/shell_command.cc'; fi`; \618 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-shell_command.Tpo" "$(DEPDIR)/orxonox-shell_command.Po"; else rm -f "$(DEPDIR)/orxonox-shell_command.Tpo"; exit 1; fi619 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/shell_command.cc' object='orxonox-shell_command.obj' libtool=no @AMDEPBACKSLASH@620 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-shell_command.Po' tmpdepfile='$(DEPDIR)/orxonox-shell_command.TPo' @AMDEPBACKSLASH@621 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@622 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-shell_command.obj `if test -f 'util/shell_command.cc'; then $(CYGPATH_W) 'util/shell_command.cc'; else $(CYGPATH_W) '$(srcdir)/util/shell_command.cc'; fi`623 584 624 585 orxonox-game_loader.o: util/loading/game_loader.cc -
trunk/src/defs/include_paths.am
r4849 r5160 14 14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui 15 15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang 16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/shell 16 17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util 17 18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math -
trunk/src/lib/Makefile.am
r4643 r5160 9 9 collision_detection \ 10 10 tinyxml \ 11 shell \ 11 12 gui \ 12 13 $(GTK_PROGS) -
trunk/src/lib/Makefile.in
r5100 r5160 174 174 collision_detection \ 175 175 tinyxml \ 176 shell \ 176 177 gui \ 177 178 $(GTK_PROGS) … … 189 190 esac; \ 190 191 done; \ 191 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/Makefile'; \192 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/Makefile'; \ 192 193 cd $(top_srcdir) && \ 193 $(AUTOMAKE) -- gnusrc/lib/Makefile194 $(AUTOMAKE) --foreign src/lib/Makefile 194 195 .PRECIOUS: Makefile 195 196 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/collision_detection/Makefile.in
r5100 r5160 224 224 esac; \ 225 225 done; \ 226 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/collision_detection/Makefile'; \226 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/collision_detection/Makefile'; \ 227 227 cd $(top_srcdir) && \ 228 $(AUTOMAKE) -- gnusrc/lib/collision_detection/Makefile228 $(AUTOMAKE) --foreign src/lib/collision_detection/Makefile 229 229 .PRECIOUS: Makefile 230 230 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/event/Makefile.in
r5100 r5160 212 212 esac; \ 213 213 done; \ 214 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/event/Makefile'; \214 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/event/Makefile'; \ 215 215 cd $(top_srcdir) && \ 216 $(AUTOMAKE) -- gnusrc/lib/event/Makefile216 $(AUTOMAKE) --foreign src/lib/event/Makefile 217 217 .PRECIOUS: Makefile 218 218 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/graphics/Makefile.in
r5100 r5160 179 179 esac; \ 180 180 done; \ 181 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/Makefile'; \181 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/Makefile'; \ 182 182 cd $(top_srcdir) && \ 183 $(AUTOMAKE) -- gnusrc/lib/graphics/Makefile183 $(AUTOMAKE) --foreign src/lib/graphics/Makefile 184 184 .PRECIOUS: Makefile 185 185 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/graphics/importer/Makefile.in
r5100 r5160 217 217 esac; \ 218 218 done; \ 219 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/importer/Makefile'; \219 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/importer/Makefile'; \ 220 220 cd $(top_srcdir) && \ 221 $(AUTOMAKE) -- gnusrc/lib/graphics/importer/Makefile221 $(AUTOMAKE) --foreign src/lib/graphics/importer/Makefile 222 222 .PRECIOUS: Makefile 223 223 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/graphics/spatial_separation/Makefile.in
r5100 r5160 205 205 esac; \ 206 206 done; \ 207 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/spatial_separation/Makefile'; \207 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/spatial_separation/Makefile'; \ 208 208 cd $(top_srcdir) && \ 209 $(AUTOMAKE) -- gnusrc/lib/graphics/spatial_separation/Makefile209 $(AUTOMAKE) --foreign src/lib/graphics/spatial_separation/Makefile 210 210 .PRECIOUS: Makefile 211 211 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/gui/Makefile.in
r5100 r5160 241 241 esac; \ 242 242 done; \ 243 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/Makefile'; \243 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/Makefile'; \ 244 244 cd $(top_srcdir) && \ 245 $(AUTOMAKE) -- gnusrc/lib/gui/Makefile245 $(AUTOMAKE) --foreign src/lib/gui/Makefile 246 246 .PRECIOUS: Makefile 247 247 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/particles/Makefile.in
r5100 r5160 209 209 esac; \ 210 210 done; \ 211 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/particles/Makefile'; \211 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/particles/Makefile'; \ 212 212 cd $(top_srcdir) && \ 213 $(AUTOMAKE) -- gnusrc/lib/particles/Makefile213 $(AUTOMAKE) --foreign src/lib/particles/Makefile 214 214 .PRECIOUS: Makefile 215 215 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/physics/Makefile.in
r5100 r5160 218 218 esac; \ 219 219 done; \ 220 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/physics/Makefile'; \220 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/physics/Makefile'; \ 221 221 cd $(top_srcdir) && \ 222 $(AUTOMAKE) -- gnusrc/lib/physics/Makefile222 $(AUTOMAKE) --foreign src/lib/physics/Makefile 223 223 .PRECIOUS: Makefile 224 224 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/shell/Makefile.am
r5157 r5160 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 noinst_LIBRARIES = libORX particles.a4 noinst_LIBRARIES = libORXshell.a 5 5 6 libORXparticles_a_SOURCES = particle_engine.cc \ 7 particle_emitter.cc \ 8 particle_system.cc \ 9 quick_animation.cc 6 libORXshell_a_SOURCES = shell.cc \ 7 shell_command.cc 10 8 11 9 12 noinst_HEADERS= particle_engine.h \ 13 particle_emitter.h \ 14 particle_system.h \ 15 quick_animation.h 10 noinst_HEADERS= shell.h \ 11 shell_command.h -
trunk/src/lib/shell/Makefile.in
r5157 r5160 16 16 17 17 18 SOURCES = $(libORX particles_a_SOURCES)18 SOURCES = $(libORXshell_a_SOURCES) 19 19 20 20 srcdir = @srcdir@ … … 39 39 POST_UNINSTALL = : 40 40 host_triplet = @host@ 41 subdir = src/lib/ particles41 subdir = src/lib/shell 42 42 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 43 43 $(srcdir)/Makefile.in … … 52 52 AR = ar 53 53 ARFLAGS = cru 54 libORXparticles_a_AR = $(AR) $(ARFLAGS) 55 libORXparticles_a_LIBADD = 56 am_libORXparticles_a_OBJECTS = particle_engine.$(OBJEXT) \ 57 particle_emitter.$(OBJEXT) particle_system.$(OBJEXT) \ 58 quick_animation.$(OBJEXT) 59 libORXparticles_a_OBJECTS = $(am_libORXparticles_a_OBJECTS) 54 libORXshell_a_AR = $(AR) $(ARFLAGS) 55 libORXshell_a_LIBADD = 56 am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_command.$(OBJEXT) 57 libORXshell_a_OBJECTS = $(am_libORXshell_a_OBJECTS) 60 58 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 61 59 depcomp = $(SHELL) $(top_srcdir)/depcomp 62 60 am__depfiles_maybe = depfiles 63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/particle_emitter.Po \ 64 @AMDEP_TRUE@ ./$(DEPDIR)/particle_engine.Po \ 65 @AMDEP_TRUE@ ./$(DEPDIR)/particle_system.Po \ 66 @AMDEP_TRUE@ ./$(DEPDIR)/quick_animation.Po 61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shell.Po \ 62 @AMDEP_TRUE@ ./$(DEPDIR)/shell_command.Po 67 63 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 68 64 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) … … 70 66 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 71 67 -o $@ 72 SOURCES = $(libORX particles_a_SOURCES)73 DIST_SOURCES = $(libORX particles_a_SOURCES)68 SOURCES = $(libORXshell_a_SOURCES) 69 DIST_SOURCES = $(libORXshell_a_SOURCES) 74 70 HEADERS = $(noinst_HEADERS) 75 71 ETAGS = etags … … 185 181 target_vendor = @target_vendor@ 186 182 MAINSRCDIR = ../.. 187 noinst_LIBRARIES = libORXparticles.a 188 libORXparticles_a_SOURCES = particle_engine.cc \ 189 particle_emitter.cc \ 190 particle_system.cc \ 191 quick_animation.cc 192 193 noinst_HEADERS = particle_engine.h \ 194 particle_emitter.h \ 195 particle_system.h \ 196 quick_animation.h 183 noinst_LIBRARIES = libORXshell.a 184 libORXshell_a_SOURCES = shell.cc \ 185 shell_command.cc 186 187 noinst_HEADERS = shell.h \ 188 shell_command.h 197 189 198 190 all: all-am … … 209 201 esac; \ 210 202 done; \ 211 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnu src/lib/particles/Makefile'; \203 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/shell/Makefile'; \ 212 204 cd $(top_srcdir) && \ 213 $(AUTOMAKE) -- gnu src/lib/particles/Makefile205 $(AUTOMAKE) --foreign src/lib/shell/Makefile 214 206 .PRECIOUS: Makefile 215 207 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 232 224 clean-noinstLIBRARIES: 233 225 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) 234 libORX particles.a: $(libORXparticles_a_OBJECTS) $(libORXparticles_a_DEPENDENCIES)235 -rm -f libORX particles.a236 $(libORX particles_a_AR) libORXparticles.a $(libORXparticles_a_OBJECTS) $(libORXparticles_a_LIBADD)237 $(RANLIB) libORX particles.a226 libORXshell.a: $(libORXshell_a_OBJECTS) $(libORXshell_a_DEPENDENCIES) 227 -rm -f libORXshell.a 228 $(libORXshell_a_AR) libORXshell.a $(libORXshell_a_OBJECTS) $(libORXshell_a_LIBADD) 229 $(RANLIB) libORXshell.a 238 230 239 231 mostlyclean-compile: … … 243 235 -rm -f *.tab.c 244 236 245 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_emitter.Po@am__quote@ 246 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@ 247 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@ 248 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick_animation.Po@am__quote@ 237 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@ 238 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Po@am__quote@ 249 239 250 240 .cc.o: -
trunk/src/lib/shell/shell.cc
r5159 r5160 396 396 * @todo 397 397 */ 398 void Shell::moveBuffer( int lineCount)398 void Shell::moveBuffer(unsigned int lineCount) 399 399 { 400 400 } -
trunk/src/lib/sound/Makefile.in
r5100 r5160 201 201 esac; \ 202 202 done; \ 203 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/sound/Makefile'; \203 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/sound/Makefile'; \ 204 204 cd $(top_srcdir) && \ 205 $(AUTOMAKE) -- gnusrc/lib/sound/Makefile205 $(AUTOMAKE) --foreign src/lib/sound/Makefile 206 206 .PRECIOUS: Makefile 207 207 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/tinyxml/Makefile.in
r5100 r5160 204 204 esac; \ 205 205 done; \ 206 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/tinyxml/Makefile'; \206 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/tinyxml/Makefile'; \ 207 207 cd $(top_srcdir) && \ 208 $(AUTOMAKE) -- gnusrc/lib/tinyxml/Makefile208 $(AUTOMAKE) --foreign src/lib/tinyxml/Makefile 209 209 .PRECIOUS: Makefile 210 210 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/subprojects/Makefile.in
r5100 r5160 186 186 esac; \ 187 187 done; \ 188 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/Makefile'; \188 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/Makefile'; \ 189 189 cd $(top_srcdir) && \ 190 $(AUTOMAKE) -- gnusrc/subprojects/Makefile190 $(AUTOMAKE) --foreign src/subprojects/Makefile 191 191 .PRECIOUS: Makefile 192 192 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/subprojects/collision_detection/Makefile.in
r5100 r5160 281 281 esac; \ 282 282 done; \ 283 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/collision_detection/Makefile'; \283 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/collision_detection/Makefile'; \ 284 284 cd $(top_srcdir) && \ 285 $(AUTOMAKE) -- gnusrc/subprojects/collision_detection/Makefile285 $(AUTOMAKE) --foreign src/subprojects/collision_detection/Makefile 286 286 .PRECIOUS: Makefile 287 287 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/subprojects/importer/Makefile.in
r5100 r5160 250 250 esac; \ 251 251 done; \ 252 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/importer/Makefile'; \252 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/importer/Makefile'; \ 253 253 cd $(top_srcdir) && \ 254 $(AUTOMAKE) -- gnusrc/subprojects/importer/Makefile254 $(AUTOMAKE) --foreign src/subprojects/importer/Makefile 255 255 .PRECIOUS: Makefile 256 256 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/subprojects/particles/Makefile.in
r5100 r5160 267 267 esac; \ 268 268 done; \ 269 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/particles/Makefile'; \269 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/particles/Makefile'; \ 270 270 cd $(top_srcdir) && \ 271 $(AUTOMAKE) -- gnusrc/subprojects/particles/Makefile271 $(AUTOMAKE) --foreign src/subprojects/particles/Makefile 272 272 .PRECIOUS: Makefile 273 273 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/subprojects/testmain/Makefile.in
r5100 r5160 196 196 esac; \ 197 197 done; \ 198 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/testmain/Makefile'; \198 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/testmain/Makefile'; \ 199 199 cd $(top_srcdir) && \ 200 $(AUTOMAKE) -- gnusrc/subprojects/testmain/Makefile200 $(AUTOMAKE) --foreign src/subprojects/testmain/Makefile 201 201 .PRECIOUS: Makefile 202 202 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset
for help on using the changeset viewer.