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

Timestamp:

Jun 20, 2006, 1:24:11 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

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

trunk/src/lib/graphics/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXgraphics.a
 
-libORXgraphics_a_SOURCES = graphics_engine.cc \
-                           light.cc \
-                           shader.cc \
-                           \
-                           render2D/render_2d.cc \
-                           render2D/element_2d.cc \
-                           render2D/image_plane.cc \
-                           \
-                           text_engine/text_engine.cc \
-                           text_engine/text.cc \
-                           text_engine/multi_line_text.cc \
-                           text_engine/font.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/lightening_effect.cc \
-                           effects/lense_flare.cc
+libORXgraphics_a_SOURCES = \
+                graphics_engine.cc \
+                light.cc \
+                shader.cc \
+                \
+                render2D/render_2d.cc \
+                render2D/element_2d.cc \
+                render2D/image_plane.cc \
+                \
+                text_engine/text_engine.cc \
+                text_engine/text.cc \
+                text_engine/multi_line_text.cc \
+                text_engine/limited_width_text.cc \
+                text_engine/font.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/lightening_effect.cc \
+                effects/lense_flare.cc
 
 noinst_HEADERS = graphics_engine.h \
@@ -40 +42 @@
                  text_engine/text.h \
                  text_engine/multi_line_text.h \
+                 text_engine/limited_width_text.h \
                  text_engine/font.h \
                  text_engine/default_font.xpm \