Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/Makefile.am

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/importer/Makefile.am (modified) (4 diffs)

trunk/src/lib/graphics/importer/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXimporter.a libtc.a
 
-libORXimporter_a_SOURCES = model.cc \
-                           interactive_model.cc \
-                           md_model_structure.cc \
-                           vertex_array_model.cc \
-                           grid.cc \
-                           static_model.cc \
-                           objModel.cc \
-                           primitive_model.cc \
-                           height_map.cc \
-                           bsp_manager.cc \
-                           bsp_file.cc \
-                           bsp_tree_node.cc \
-                           bsp_tree_leaf.cc \
-                           \
-                           material.cc \
-                           texture.cc \
-                           texture_data.cc \
-                           texture_sequence.cc \
-                           media_container.cc \
-                           movie_player.cc \
-                           \
-                           bsp_manager.cc \
-                           bsp_file.cc \
-                           bsp_tree_node.cc \
-                           bsp_tree_leaf.cc \
-                           \
-                           md2/md2Model.cc \
-                           \
-                           md3/md3_model.cc \
-                           md3/md3_animation.cc \
-                           md3/md3_animation_cfg.cc \
-                           md3/md3_bone_frame.cc \
-                           md3/md3_mesh.cc \
-                           md3/md3_data.cc \
-                           md3/md3_tag.cc
+libORXimporter_a_SOURCES = \
+                model.cc \
+                interactive_model.cc \
+                md_model_structure.cc \
+                vertex_array_model.cc \
+                grid.cc \
+                static_model.cc \
+                static_model_data.cc \
+                objModel.cc \
+                resource_obj.cc \
+                primitive_model.cc \
+                height_map.cc \
+                bsp_manager.cc \
+                bsp_file.cc \
+                bsp_tree_node.cc \
+                bsp_tree_leaf.cc \
+                \
+                material.cc \
+                texture.cc \
+                texture_data.cc \
+                resource_texture.cc \
+                texture_sequence.cc \
+                media_container.cc \
+                movie_player.cc \
+                \
+                bsp_manager.cc \
+                bsp_file.cc \
+                bsp_tree_node.cc \
+                bsp_tree_leaf.cc \
+                \
+                md2/md2Model.cc \
+                md2/resource_md2.cc
+#               \
+                md3/md3_model.cc \
+                md3/md3_animation.cc \
+                md3/md3_animation_cfg.cc \
+                md3/md3_bone_frame.cc \
+                md3/md3_mesh.cc \
+                md3/md3_data.cc \
+                md3/md3_tag.cc
 
 
@@ -54 +59 @@
                 grid.h \
                 static_model.h \
+                static_model_data.h \
                 objModel.h \
+                resource_obj.h \
                 primitive_model.h \
                 anorms.h \
@@ -63 +70 @@
                 texture.h \
                 texture_data.h \
+                resource_texture.h \
                 texture_sequence.h \
                 \
@@ -74 +82 @@
                 \
                 md2/md2Model.h \
+                md2/resource_md2.h \
                 \
                 md3/md3_model.h \