From: Peter W. <tj...@us...> - 2012-12-09 12:22:43
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Allegro". The branch, 5.1 has been updated via 161bc64f6062b8c45ff2a868ea1864887847b45c (commit) via 23d29a66d1179de21d0b1e0e58cfc3ee1ea72349 (commit) via e8edfcf30298b4d31172e7d6c3e2e45af6e1d853 (commit) from da96395e368bc6d8ddf8dda2ca05b4182674bb8d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 161bc64f6062b8c45ff2a868ea1864887847b45c Author: Peter Wang <tj...@us...> Date: Sun Dec 9 23:07:42 2012 +1100 cmake: Building ex_menu should depend on supported features, not the non-binding WANT variables. For some reason I had WANT_GTKGLEXT_WINDOWS set in my Windows build directory, and with WANT_X11 set as well (the default) ex_menu wasn't being built. commit 23d29a66d1179de21d0b1e0e58cfc3ee1ea72349 Author: Peter Wang <tj...@us...> Date: Sun Dec 9 23:00:27 2012 +1100 shader: Make glsl_set_shader static. commit e8edfcf30298b4d31172e7d6c3e2e45af6e1d853 Author: Peter Wang <tj...@us...> Date: Sun Dec 9 23:00:00 2012 +1100 acodec: Add missing include. ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 1 + addons/acodec/helper.c | 1 + addons/shader/shader_glsl.c | 2 +- examples/CMakeLists.txt | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3acd515..bf1acdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -722,6 +722,7 @@ if(SUPPORT_X11 AND NOT ALLEGRO_RASPBERRYPI) set(ALLEGRO_CFG_USE_GTKGLEXT 1) set(HAVE_GTK 1) set(ALLEGRO_CFG_USE_GTK 1) + set(SUPPORT_GTKGLEXT_WINDOWS 1) else(GTKGLEXT_FOUND) message(FATAL_ERROR "GtkGLExt requested but not found.") endif(GTKGLEXT_FOUND) diff --git a/addons/acodec/helper.c b/addons/acodec/helper.c index bf97215..8619298 100644 --- a/addons/acodec/helper.c +++ b/addons/acodec/helper.c @@ -3,6 +3,7 @@ #include "allegro5/internal/aintern.h" #include "allegro5/internal/aintern_audio.h" #include "allegro5/internal/aintern_system.h" +#include "helper.h" void _al_acodec_stop_feed_thread(ALLEGRO_AUDIO_STREAM *stream) { diff --git a/addons/shader/shader_glsl.c b/addons/shader/shader_glsl.c index 00f4ee9..4f8d443 100644 --- a/addons/shader/shader_glsl.c +++ b/addons/shader/shader_glsl.c @@ -607,7 +607,7 @@ static bool glsl_set_shader_texcoord_array(ALLEGRO_SHADER *shader, return true; } -void glsl_set_shader(ALLEGRO_DISPLAY *display, ALLEGRO_SHADER *shader) +static void glsl_set_shader(ALLEGRO_DISPLAY *display, ALLEGRO_SHADER *shader) { ASSERT(display); ASSERT(display->flags & ALLEGRO_OPENGL); diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 881dc36..49dc152 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -212,9 +212,9 @@ example(ex_stream_seek CONSOLE ${AUDIO} ${ACODEC} ${PRIM} ${FONT} ${IMAGE}) example(ex_synth ex_synth.cpp ${NIHGUI} ${AUDIO} ${TTF}) example(ex_native_filechooser ${DIALOG} ${FONT} ${IMAGE} ${COLOR}) -if(WANT_GTKGLEXT_WINDOWS OR NOT WANT_X11) +if(NOT SUPPORT_X11 OR SUPPORT_GTKGLEXT_WINDOWS) example(ex_menu ${DIALOG} ${IMAGE}) -endif(WANT_GTKGLEXT_WINDOWS OR NOT WANT_X11) +endif() # In some configurations CURL pulls in dependencies which we don't check for. # This example isn't important so it's disabled by default to prevent problems. hooks/post-receive -- Allegro |