From: <web...@pr...> - 2019-09-27 07:42:16
|
Author: entryway Date: Fri Sep 27 07:42:00 2019 New Revision: 4542 Log: #10 Fix macOS build with OpenGL https://sourceforge.net/p/prboom-plus/patches/10/ Modified: branches/prboom-plus-24/prboom2/configure.ac Modified: branches/prboom-plus-24/prboom2/configure.ac ============================================================================== --- branches/prboom-plus-24/prboom2/configure.ac Mon Sep 23 11:28:02 2019 (r4541) +++ branches/prboom-plus-24/prboom2/configure.ac Fri Sep 27 07:42:00 2019 (r4542) @@ -86,6 +86,7 @@ AC_CHECK_LIB(m,pow) dnl - system specific stuff dnl - winmm for the midi volume hack +GL_DIR="GL" case "$target" in *-*-cygwin* | *-*-mingw32*) SYS_GL_LIBS="-lopengl32 -lglu32 -lgdi32" @@ -99,6 +100,10 @@ CFLAGS="$CFLAGS -mthreads" fi ;; + *-*-darwin*) + GL_DIR="OpenGL" + SYS_GL_LIBS="-framework OpenGL" + ;; *) SYS_GL_LIBS="-lGL -lGLU" ;; @@ -111,7 +116,7 @@ AC_MSG_CHECKING(for OpenGL support) have_opengl=no AC_TRY_COMPILE([ - #include <GL/gl.h> + #include <$GL_DIR/gl.h> ],[ ],[ have_opengl=yes |