diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-05-09 10:25:10 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-05-09 10:25:10 +0000 |
| commit | 51cf70467dfbcca5fbce7f25761678dd8b487d4e (patch) | |
| tree | 151add86c7591d2a496422cf8790daec26059af8 /configure.ac | |
| parent | 29059dcf6e6fbc34c5eacd2a3c70995a1874f02b (diff) | |
| download | pcsxr-51cf70467dfbcca5fbce7f25761678dd8b487d4e.tar.gz | |
Integrated P.E.Op.S OpenGL plugin into the build tree (still does NOT work on x86_64)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@23342 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 14c74b6a..6fcb9c1e 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_SUBST(GTK2_LIBS) AC_SUBST(GLADE2_CFLAGS) AC_SUBST(GLADE2_LIBS) -AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile pixmaps/Makefile po/Makefile.in]) +AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/peopsxgl/Makefile plugins/dfcdrom/Makefile pixmaps/Makefile po/Makefile.in]) dnl Check for -fno-dse option support saved_CFLAGS="$CFLAGS" @@ -97,14 +97,17 @@ fi AC_ARG_ENABLE(dfopengl, [ --enable-dfopengl build experimental dfOpenGL plugin (default=no)], [ BUILD_DFOPENGL="$enableval" ],[ BUILD_DFOPENGL="no" ]) -DFOPENGL="" +AC_CHECK_HEADER(GL/gl.h, have_gl=yes, have_gl=no) +if test "x$have_gl" = xno; then + AC_MSG_ERROR([unable to find OpenGL headers]) +fi +AC_CHECK_HEADER(GL/glx.h, have_glx=yes, have_glx=no) +if test "x$have_glx" = xno; then + AC_MSG_ERROR([unable to find GLX headers]) +fi +DFOPENGL="" if test "$BUILD_DFOPENGL" = "yes"; then - AC_CHECK_HEADER(GL/gl.h, have_gl=yes, have_gl=no) - if test "x$have_gl" = xno; then - AC_MSG_ERROR([unable to find OpenGL headers]) - fi - DFOPENGL="plugins/dfOpenGL" AC_SUBST(DFOPENGL) AC_CONFIG_FILES([plugins/dfOpenGL/Makefile]) |