Modified Files:

[simgear.git] / simgear / screen / Makefile.am

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index d0a030bd178eed307d7510f17760ab5a80524544..482bba619cb8ffb2945712e8069578d3332b3095 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -2,6 +2,8 @@ includedir = @includedir@/screen
 
 lib_LIBRARIES = libsgscreen.a
 
+EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
+
 if ENABLE_JPEG_SERVER
 IMAGE_SERVER_INCL = jpgfactory.hxx
 IMAGE_SERVER_SRCS = jpgfactory.cxx
@@ -10,17 +12,38 @@ IMAGE_SERVER_INCL =
 IMAGE_SERVER_SRCS = 
 endif
 
-include_HEADERS = $(IMAGE_SERVER_INCL) screen-dump.hxx tr.h
+noinst_HEADERS = colours.h GLBitmaps.h
+
+include_HEADERS = \
+       colors.hxx \
+       texture.hxx \
+       $(IMAGE_SERVER_INCL) \
+       screen-dump.hxx \
+       extensions.hxx \
+       RenderTexture.h \
+       shader.h \
+       tr.h
 
 libsgscreen_a_SOURCES = \
-       GLBitmaps.cxx GLBitmaps.h \
+       texture.cxx \
+       GLBitmaps.cxx \
        $(IMAGE_SERVER_SRCS) \
        screen-dump.cxx \
-        tr.cxx \
+       tr.cxx \
+       extensions.cxx \
+       RenderTexture.cpp \
+       shader.cpp \
        win32-printer.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
-INCLUDES = -I$(top_srcdir)
+if HAVE_GLUT
+noinst_PROGRAMS = TestRenderTexture
+
+TestRenderTexture_SOURCES = TestRenderTexture.cpp
+
+TestRenderTexture_LDADD = \
+       $(top_builddir)/simgear/screen/libsgscreen.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(opengl_LIBS)
 endif
+
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES