Changeset 4504 in orxonox.OLD for orxonox/trunk/src/Makefile.am

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

File:

• orxonox/trunk/src/Makefile.am (modified) (4 diffs)

orxonox/trunk/src/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=.
 include $(MAINSRCDIR)/defs/include_paths.am
-
 
 
@@ -67 +66 @@
                  lib/graphics/importer/material.cc \
                  lib/graphics/importer/texture.cc \
+                 lib/sound/sound_engine.cc \
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
@@ -116 +116 @@
                  defs/sdlincl.h \
                  defs/glincl.h \
+                 defs/alincl.h \
                  defs/comincl.h \
                  defs/confincl.h \
@@ -137 +138 @@
                  lib/graphics/importer/material.h \
                  lib/graphics/importer/texture.h \
+                 lib/sound/sound_engine.h \
                  lib/lang/base_object.h \
                  lib/util/ini_parser.h \