Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/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/Makefile.am (modified) (3 diffs)

trunk/src/lib/graphics/Makefile.am

@@ -6 +6 @@
 libORXgraphics_a_SOURCES = \
                 graphics_engine.cc \
+                graphics_effect.cc \
                 light.cc \
                 shader.cc \
+                shader_data.cc \
+                resource_shader.cc \
                 \
                 render2D/render_2d.cc \
@@ -19 +22 @@
                 text_engine/font.cc \
                 text_engine/font_data.cc \
-                \
-                effects/graphics_effect.cc \
-                effects/atmospheric_engine.cc \
-                effects/weather_effect.cc \
-                effects/sun_effect.cc \
-                effects/fog_effect.cc \
-                effects/volfog_effect.cc \
-                effects/rain_effect.cc \
-                effects/snow_effect.cc \
-                effects/cloud_effect.cc \
-                effects/lightning_effect.cc \
-                effects/lense_flare.cc
+                text_engine/resource_font.cc
 
 noinst_HEADERS =\
                 graphics_engine.h \
+                graphics_effect.h \
                 light.h \
                 shader.h \
+                shader_data.h \
+                resource_shader.h \
                 \
                 render2D/render_2d.h \
@@ -47 +42 @@
                 text_engine/font.h \
                 text_engine/font_data.h \
-                text_engine/default_font.xpm \
-                \
-                effects/graphics_effect.h \
-                effects/atmospheric_engine.h \
-                effects/weather_effect.h \
-                effects/sun_effect.h \
-                effects/fog_effect.h \
-                effects/volfog_effect.h \
-                effects/rain_effect.h \
-                effects/snow_effect.h \
-                effects/cloud_effect.h \
-                effects/lightning_effect.h \
-                effects/lense_flare.h
+                text_engine/resource_font.h \
+                text_engine/default_font.xpm