Thread: [Jahshaka-cvs] SF.net SVN: openlibraries: [1326] trunk/test
Status: Beta
Brought to you by:
jahshaka
From: <gl...@us...> - 2007-10-28 17:11:21
|
Revision: 1326 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1326&view=rev Author: glslang Date: 2007-10-28 10:11:20 -0700 (Sun, 28 Oct 2007) Log Message: ----------- +merge fixes Modified Paths: -------------- trunk/test/openimagelib/GL/Makefile.am trunk/test/openmedialib/player/Makefile.am trunk/test/openobjectlib/GL/Makefile.am trunk/test/openpluginlib/gpu_timer_query/Makefile.am Modified: trunk/test/openimagelib/GL/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/Makefile.am 2007-10-28 16:53:41 UTC (rev 1325) +++ trunk/test/openimagelib/GL/Makefile.am 2007-10-28 17:11:20 UTC (rev 1326) @@ -3,6 +3,8 @@ # # +if HAVE_GL_GL_H + SUBDIRS = \ _2D \ _2D_compressed \ @@ -12,3 +14,5 @@ _2D_exr \ _2D_scale \ _2D_sgi + +endif Modified: trunk/test/openmedialib/player/Makefile.am =================================================================== --- trunk/test/openmedialib/player/Makefile.am 2007-10-28 16:53:41 UTC (rev 1325) +++ trunk/test/openmedialib/player/Makefile.am 2007-10-28 17:11:20 UTC (rev 1326) @@ -1,3 +1,10 @@ + +# +# +# + +if HAVE_GL_GL_H + check_PROGRAMS = player player_SOURCES = \ @@ -27,3 +34,5 @@ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \ $(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \ $(DL_LIBS) + +endif Modified: trunk/test/openobjectlib/GL/Makefile.am =================================================================== --- trunk/test/openobjectlib/GL/Makefile.am 2007-10-28 16:53:41 UTC (rev 1325) +++ trunk/test/openobjectlib/GL/Makefile.am 2007-10-28 17:11:20 UTC (rev 1326) @@ -3,8 +3,12 @@ # # +if HAVE_GL_GL_H + SUBDIRS = \ multipass_draw \ noise_volume \ obj_draw \ texture_draw + +endif Modified: trunk/test/openpluginlib/gpu_timer_query/Makefile.am =================================================================== --- trunk/test/openpluginlib/gpu_timer_query/Makefile.am 2007-10-28 16:53:41 UTC (rev 1325) +++ trunk/test/openpluginlib/gpu_timer_query/Makefile.am 2007-10-28 17:11:20 UTC (rev 1326) @@ -3,6 +3,8 @@ # # +if HAVE_GL_GL_H + check_PROGRAMS = gpu_timer_query gpu_timer_query_SOURCES = \ @@ -29,3 +31,4 @@ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ $(DL_LIBS) +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |