qiqian / webp

Automatically exported from code.google.com/p/webp
0 stars 0 forks source link

Support OpenGL & "WIC" on mingw64 #211

Open GoogleCodeExporter opened 8 years ago

GoogleCodeExporter commented 8 years ago
Perhaps 
http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_
check_gl.m4 is a better alternative?

diff --git a/configure.ac b/configure.ac
index 128b76b..bfd4c19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,7 +186,7 @@ AS_IF([test "x$enable_gl" != "xno"], [

       # find libGL
       GL_SAVED_LIBS="$LIBS"
-      AC_SEARCH_LIBS([glBegin], [GL OpenGL])
+      AC_SEARCH_LIBS([glBegin], [GL OpenGL opengl32])
       LIBS="$GL_SAVED_LIBS"

       # A direct link to libGL may not be necessary on e.g., linux.
@@ -365,7 +365,7 @@ AC_ARG_ENABLE([wic],
                               @<:@default=auto@:>@]),,
               [enable_wic=yes])

-if test "$target_os" = "mingw32" -a "$enable_wic" = "yes"; then
+if test \( "$target_os" = "mingw32" -o "$target_os" = "mingw64" \) -a 
"$enable_wic" = "yes"; then
   AC_CHECK_HEADERS([wincodec.h shlwapi.h windows.h])
   if test "$ac_cv_header_wincodec_h" = "yes"; then
     AC_MSG_CHECKING(for Windows Imaging Component support)

Original issue reported on code.google.com by grizzly.nyo on 23 Jun 2014 at 7:10

GoogleCodeExporter commented 8 years ago
> Perhaps 
http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_
check_gl.m4 is a better alternative?

Could be, I can't remember why I avoided it when I added this, it might have 
been for autoconf compatibility. Still it's worth another look.
This fix should be OK in the meantime.

Original comment by jz...@google.com on 28 Jun 2014 at 2:13

GoogleCodeExporter commented 8 years ago
This changed was merged. The check on ax_check_gl.m4 is still open.

9cc69e2 Merge "configure: support WIC + OpenGL under mingw64"
10f4257 configure: support WIC + OpenGL under mingw64
https://gerrit.chromium.org/gerrit/#/c/70751/

Original comment by jz...@google.com on 23 Jul 2014 at 12:15