--- allegro-4.4.1.1.old/CMakeLists.txt +++ allegro-4.4.1.1/CMakeLists.txt @@ -825,7 +825,7 @@ # Addons # -option(WANT_ALLEGROGL "Enable AllegroGL" on) +option(WANT_ALLEGROGL "Enable AllegroGL" off) option(WANT_LOADPNG "Enable loadpng" on) option(WANT_LOGG "Enable logg" on) option(WANT_JPGALLEG "Enable JPGAlleg" on) @@ -901,7 +901,7 @@ # Samples - after addons because skater can use AllegroGL # -option(WANT_EXAMPLES "Build example programs" on) +option(WANT_EXAMPLES "Build example programs" on) if(WANT_EXAMPLES) add_subdirectory(examples) --- allegro-4.4.1.1.old/addons/allegrogl/src/glext.c +++ allegro-4.4.1.1/addons/allegrogl/src/glext.c @@ -5,6 +5,10 @@ * \brief OpenGL extension management. */ +#define ALLEGRO_GLXGETPROCADDRESSARB 1 +#define ALLEGROGL_GLXGETPROCADDRESSARB 1 +#define GLX_GLXEXT_LEGACY 1 + #include "alleggl.h" #include "allglint.h" #include --- allegro-4.4.1.1.old/cmake/FindVorbis.cmake +++ allegro-4.4.1.1/cmake/FindVorbis.cmake @@ -12,9 +12,14 @@ endif(VORBIS_INCLUDE_DIR) find_path(OGG_INCLUDE_DIR ogg/ogg.h) find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h) - find_library(OGG_LIBRARY NAMES ogg) - find_library(VORBIS_LIBRARY NAMES vorbis) - find_library(VORBISFILE_LIBRARY NAMES vorbisfile) + + find_library(OGG_LIBRARY NAMES ogg + PATHS __META_PRODTREE__/libogg/lib) + find_library(VORBIS_LIBRARY NAMES vorbis + PATHS __META_PRODTREE__/libvorbis/lib) + find_library(VORBISFILE_LIBRARY NAMES vorbisfile + PATHS __META_PRODTREE__/libvorbis/lib) + # Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND # to TRUE if all listed variables are TRUE. include(FindPackageHandleStandardArgs)