Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4504 in orxonox.OLD for orxonox/trunk/src/subprojects


Ignore:
Timestamp:
Jun 4, 2005, 12:38:30 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

Location:
orxonox/trunk/src/subprojects
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r4438 r4504  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --foreign  src/subprojects/Makefile
     190          $(AUTOMAKE) --gnu  src/subprojects/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/gui/Makefile.in

    r4438 r4504  
    194194target_vendor = @target_vendor@
    195195MAINSRCDIR = ../..
    196 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
    197196AM_LDFLAGS = $(MWINDOWS)
    198197gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a
    … …  
    229228          esac; \
    230229        done; \
    231         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile'; \
     230        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile'; \
    232231        cd $(top_srcdir) && \
    233           $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile
     232          $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile
    234233.PRECIOUS: Makefile
    235234Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    688687        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    689688
     689include $(MAINSRCDIR)/defs/include_paths.am
    690690# Tell versions [3.59,3.63) of GNU make to not export all variables.
    691691# Otherwise a system limit (for SysV at least) may be exceeded.

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

    r4492 r4504  
    237237          esac; \
    238238        done; \
    239         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
     239        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
    240240        cd $(top_srcdir) && \
    241           $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
     241          $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
    242242.PRECIOUS: Makefile
    243243Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4493 r4504  
    260260          esac; \
    261261        done; \
    262         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
     262        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
    263263        cd $(top_srcdir) && \
    264           $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
     264          $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
    265265.PRECIOUS: Makefile
    266266Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r4438 r4504  
    180180target_vendor = @target_vendor@
    181181MAINSRCDIR = ../..
    182 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    183182AM_LDFLAGS = $(MWINDOWS)
    184183testmain_SOURCES = testmain.cc
    … …  
    197196          esac; \
    198197        done; \
    199         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
     198        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
    200199        cd $(top_srcdir) && \
    201           $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
     200          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
    202201.PRECIOUS: Makefile
    203202Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    435434        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    436435
     436include $(MAINSRCDIR)/defs/include_paths.am
    437437# Tell versions [3.59,3.63) of GNU make to not export all variables.
    438438# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.