<html>
<body>
<div id="body" style="background-color:#ffffff;" >
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head" style="border-bottom-width:1px;border-bottom-style:solid;" ><td class="headtd" style="padding:0;padding-top:.2em;" colspan="4">Commit in <b><tt>lxdream</tt></b></td></tr>
<tr><td><tt><a href="#file1">Makefile.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+2</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">configure</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+6602</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-6381</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr><td><tt><a href="#file3">configure.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+52</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-23</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr class="alt" style=";" ><td><tt>src/<a href="#file4">Makefile.am</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+5</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-1</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr><td><tt> /<a href="#file5">Makefile.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+64</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-60</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr class="alt" style=";" ><td><tt>src/drivers/<a href="#file6">gl_sl.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+2</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-2</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr><td><tt> /<a href="#file7">video_egl.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+68</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-24</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file8">video_egl.h</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+4</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr><td><tt> /<a href="#file9">video_gtk.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+23</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr class="alt" style=";" ><td><tt>src/pvr2/<a href="#file10">glutil.h</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+14</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr><td><tt>src/tools/<a href="#file11">Makefile.am</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+3</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-3</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file12">Makefile.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+5</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-3</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">8376a612a79d -> dac8f363f1fe</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+6844</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-6497</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >12 modified files</small><br />
<div class="tasklist" style="padding:4px;border:1px dashed #000000;margin-top:1em;" ><ul>
<li><a href="#task1">FIXME: These cross compiler hacks should be removed for Autoconf 3.0</a></li>
<li><a href="#task2">TODO: get from config info */</a></li>
</ul></div>
<pre class="comment" style="white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd;" >
Add support for Nokia N900
- Generic support for EGL with GTK
- Workaround for nokia bug with egl config
Based on patch from guinux, thanks!
</pre>
<hr /><a name="file1" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.in</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.in
+++ lxdream/Makefile.in
@@ -240,6 +240,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+VIDEO_EGL_FALSE = @VIDEO_EGL_FALSE@
+VIDEO_EGL_TRUE = @VIDEO_EGL_TRUE@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > VIDEO_GLX_FALSE = @VIDEO_GLX_FALSE@
VIDEO_GLX_TRUE = @VIDEO_GLX_TRUE@
VIDEO_NSGL_FALSE = @VIDEO_NSGL_FALSE@
</pre></div>
<hr /><a name="file2" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>configure</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/configure
+++ lxdream/configure
@@ -682,16 +682,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_cpu
host_vendor
host_os
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-ANT
-ANDROID_ABI
-ANDROID_SDK_HOME
-ANDROID_NDK_HOME
-ANDROID_SDK_VERSION
-ANDROID_NDK_VERSION
-ANDROID_GDBSERVER
-GDB
-GUI_ANDROID_TRUE
-GUI_ANDROID_FALSE
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > CC
CFLAGS
LDFLAGS
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -738,6 +728,15 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am__fastdepOBJC_FALSE
POD2MAN
POD2HTML
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANT
+ANDROID_ABI
+ANDROID_SDK_HOME
+ANDROID_NDK_HOME
+ANDROID_SDK_VERSION
+ANDROID_NDK_VERSION
+ANDROID_GDBSERVER
+GUI_ANDROID_TRUE
+GUI_ANDROID_FALSE
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GUI_COCOA_TRUE
GUI_COCOA_FALSE
SOEXT
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -768,6 +767,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > VIDEO_GLX_FALSE
VIDEO_NSGL_TRUE
VIDEO_NSGL_FALSE
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+VIDEO_EGL_TRUE
+VIDEO_EGL_FALSE
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > BUILD_SH4X86_TRUE
BUILD_SH4X86_FALSE
AUDIO_OSX_TRUE
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -1465,17 +1466,18 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- --with-android=SDK Specify the location of the Android SDK
- --with-android-ndk=NDK Specify the location of the Android NDK
- --with-android-version Specify target Android SDK version
- --with-android-version Specify target Android NDK version
- --with-android-abi Specify target Android ABI
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > --with-osmesa Build with the osmesa GL library (software
rendering)
--with-gtk Build with the GTK UI. Default on X11 systems
--with-esd Build with support for the ESounD audio system
--with-pulse Build with support for the PulseAudio audio system
--with-sdl Build with support for SDL audio
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ --with-sysroot=SYSROOT Build using an alternate sysroot
+ --with-android=SDK Specify the location of the Android SDK
+ --with-android-ndk=NDK Specify the location of the Android NDK
+ --with-android-version Specify target Android SDK version
+ --with-android-version Specify target Android NDK version
+ --with-android-abi Specify target Android ABI
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
Some influential environment variables:
CC C compiler command
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2530,6 +2532,6245 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort. b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions. Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
+ break;;
+ * )
+ break;;
+ esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
<a name="task1" />+# <span class="task" style="background-color:#ffff00;" >FIXME</span>: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+ if { ac_try='./$ac_file'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
+done
+else
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
</pre></pre>
<strong class="error" style="color:red;" >[truncated at 1000 lines; 12212 more skipped]</strong>
</div>
<hr /><a name="file3" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>configure.in</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/configure.in
+++ lxdream/configure.in
@@ -10,7 +10,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
m4_include([m4/ccforbuild.m4])
m4_include([m4/android.m4])
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-LX_ANDROID_BUILD
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
AC_ISC_POSIX
AC_PROG_CC
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -79,16 +78,30 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_ARG_WITH( sdl,
AS_HELP_STRING( [--with-sdl], [Build with support for SDL audio]) )
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+AC_ARG_WITH( sysroot,
+ AS_HELP_STRING( [--with-sysroot=SYSROOT], [Build using an alternate sysroot]),
+ [ m4_pattern_allow([PKG_CONFIG_LIBDIR])
+ if test -d "$with_sysroot/lib/pkgconfig"; then
+ LDFLAGS="$LDFLAGS -L$with_sysroot/lib"
+ CPPFLAGS="$CPPFLAGS -I$with_sysroot/include"
+ BUILD_PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
+ TARGET_PKG_CONFIG_LIBDIR="$with_sysroot/lib/pkgconfig"
+ PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR"
+ export PKG_CONFIG_LIBDIR;
+ else
+ AC_MSG_FAILURE([pkg-config directory $with_sysroot/lib/pkgconfig not found, when using --with-sysroot=$with_sysroot option])
+ fi
+ ])
+
+LX_ANDROID_BUILD
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > dnl ------------ Check if we're building on Darwin or Android --------------
dnl For starters, do we have a working objective-c compiler?
if test "$ANDROID_BUILD" = "yes"; then
with_gtk=no;
EXTRA_OUTPUT_FILES="src/android/build.properties"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- LIBS="-lEGL -lGLESv2 $LIBS"
- AC_DEFINE(HAVE_GLES2, 1, [Using GLESv2])
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > UI_DRIVER="Android"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- VIDEO_DRIVERS="egl"
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > with_sdl=no
else
AC_HAVE_OBJC([
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -255,7 +268,17 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
AC_PUSH_CC_FOR_BUILD
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "$BUILD_PKG_CONFIG_LIBDIR" != "$TARGET_PKG_CONFIG_LIBDIR"; then
+ PKG_CONFIG_LIBDIR="$BUILD_PKG_CONFIG_LIBDIR";
+ if test "x$PKG_CONFIG_LIBDIR" = "x"; then
+ export -n PKG_CONFIG_LIBDIR
+ fi
+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > PKG_CHECK_MODULES(GLIB_FOR_BUILD, glib-2.0)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "$BUILD_PKG_CONFIG_LIBDIR" != "$TARGET_PKG_CONFIG_LIBDIR"; then
+ PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR";
+ export PKG_CONFIG_LIBDIR
+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_POP_CC_FOR_BUILD
AM_CONDITIONAL(GUI_GTK, [test "$HAVE_GTK" = 'yes'])
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -281,39 +304,45 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
dnl Otherwise we want a real GL library (unless we're on darwin or android, in which case it's already
dnl taken care of above).
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if test "x$APPLE_BUILD" != 'xyes' -a "x$ANDROID_BUILD" != 'xyes'; then
- PKG_CHECK_MODULES(LIBGL, [gl] )
- dnl AC_CHECK_LIB(GL, glVertex3f, [], [
- dnl AC_MSG_FAILURE( ["The OpenGL library (libGL.so) could not be found, but is required."])])
- dnl AC_CHECK_HEADER([GL/gl.h], [], [
- dnl AC_MSG_FAILURE( ["The OpenGL header files (eg GL/gl.h) could not be found, but are required."])])
- LIBS="$LIBS $LIBGL_LIBS";
- CPPFLAGS="$CPPFLAGS $LIBGL_CFLAGS";
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if test "x$APPLE_BUILD" != 'xyes'; then
+ PKG_CHECK_MODULES(LIBGL, [gl], [
+ LIBS="$LIBS $LIBGL_LIBS";
+ CPPFLAGS="$CPPFLAGS $LIBGL_CFLAGS";
+ ], [
+ dnl GL library not found, try for GLESv2 + EGL
+ AC_CHECK_LIB(GLESv2, glEnable, [LIBS="-lGLESv2 $LIBS"; HAVE_GLES2='yes'],
+ [ AC_MSG_FAILURE([Neither the OpenGL library (libGL.so) nor the OpenGL ES 2.0 library (libGLESv2.so) could be found, but one is required.]) ])
+ ])
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > else
AC_CHECK_FUNC(NSOpenGLGetVersion, [
HAVE_NSGL='yes'
VIDEO_DRIVERS="$VIDEO_DRIVERS nsgl"
AC_DEFINE([HAVE_NSGL],1, [Have NSOpenGL support]) ] )
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if test "x$HAVE_GTK_X11" = "xyes"; then
+ LIBS="$LIBS -L/usr/X11/lib -lGL"
+ fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
dnl Now work out how to get from the UI to GL - this is usually the painful part.
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if test "x$HAVE_GTK_X11" = "xyes"; then
- if test "x$APPLE_BUILD" = "xyes"; then
- LIBS="$LIBS -L/usr/X11/lib -lGL"
- fi
- AC_CHECK_FUNC(glXQueryVersion, [
- HAVE_GLX='yes'
- VIDEO_DRIVERS="$VIDEO_DRIVERS glx"
- AC_DEFINE([HAVE_GLX], 1, [Have GLX support]) ] )
- fi
-
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ AC_CHECK_FUNC(glXQueryVersion, [
+ HAVE_GLX='yes'
+ VIDEO_DRIVERS="$VIDEO_DRIVERS glx"
+ AC_DEFINE([HAVE_GLX], 1, [Have GLX support]) ] )
+ AC_CHECK_LIB(EGL, eglGetDisplay, [
+ LIBS="-lEGL $LIBS"
+ HAVE_EGL='yes'
+ VIDEO_DRIVERS="$VIDEO_DRIVERS egl"])
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ])
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "x$HAVE_GLES2" = "xyes"; then
+ AC_DEFINE(HAVE_GLES2, 1, [Using GLESv2])
+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
AM_CONDITIONAL(VIDEO_OSMESA, [test "x$HAVE_OSMESA" = "xyes"])
AM_CONDITIONAL(VIDEO_GLX, [test "x$HAVE_GLX" = "xyes"])
AM_CONDITIONAL(VIDEO_NSGL, [test "x$HAVE_NSGL" = "xyes"])
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+AM_CONDITIONAL(VIDEO_EGL, [test "x$HAVE_EGL" = "xyes"])
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
dnl Check for optional (but highly desireable) OpenGL features
AC_CHECK_FUNC(glGenFramebuffers, [ AC_DEFINE([HAVE_OPENGL_FBO],1,[Have 2.0 framebuffer_object support]) ], [])
</pre></div>
<hr /><a name="file4" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.am</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/Makefile.am
+++ lxdream/src/Makefile.am
@@ -116,7 +116,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > endif
if GUI_ANDROID
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-lxdream_SOURCES += gui_none.c drivers/video_egl.c drivers/video_egl.h
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+lxdream_SOURCES += gui_none.c
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > noinst_PROGRAMS=liblxdream.so
liblxdream_so_LINK = $(LINK) -Wl,-soname,liblxdream.so -shared
liblxdream_so_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ -lm
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -145,6 +145,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_SOURCES += drivers/video_nsgl.m drivers/video_nsgl.h
endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if VIDEO_EGL
+lxdream_SOURCES += drivers/video_egl.c drivers/video_egl.h
+endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if AUDIO_OSX
lxdream_SOURCES += drivers/audio_osx.m
endif
</pre></div>
<hr /><a name="file5" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.in</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/Makefile.in
+++ lxdream/src/Makefile.in
@@ -60,7 +60,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_GTK_TRUE@ gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
@GUI_GTK_TRUE@ drivers/video_gtk.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_ANDROID_TRUE@am__append_5 = gui_none.c drivers/video_egl.c drivers/video_egl.h
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@am__append_5 = gui_none.c
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_ANDROID_TRUE@noinst_PROGRAMS = liblxdream.so$(EXEEXT)
@GUI_COCOA_TRUE@am__append_6 = cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
@GUI_COCOA_TRUE@am__append_7 = cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -71,27 +71,28 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @VIDEO_OSMESA_TRUE@am__append_9 = drivers/video_gdk.c
@VIDEO_GLX_TRUE@am__append_10 = drivers/video_glx.c drivers/video_glx.h
@VIDEO_NSGL_TRUE@am__append_11 = drivers/video_nsgl.m drivers/video_nsgl.h
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@AUDIO_OSX_TRUE@am__append_12 = drivers/audio_osx.m
-@BUILD_PLUGINS_TRUE@am__append_13 = lxdream_dummy.@SOEXT@
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__append_14 = audio_sdl.@SOEXT@
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__append_15 = audio_pulse.@SOEXT@
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__append_16 = audio_esd.@SOEXT@
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__append_17 = audio_alsa.@SOEXT@
-@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__append_18 = input_lirc.@SOEXT@
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_19 = drivers/audio_sdl.c
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_20 = @SDL_LIBS@
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_21 = drivers/audio_pulse.c
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_22 = @PULSE_LIBS@
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_23 = drivers/audio_esd.c
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_24 = @ESOUND_LIBS@
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_25 = drivers/audio_alsa.c
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_26 = @ALSA_LIBS@
-@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_27 = drivers/input_lirc.c
-@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_28 = -llirc_client
-@CDROM_LINUX_TRUE@am__append_29 = drivers/cdrom/cd_linux.c
-@CDROM_OSX_TRUE@am__append_30 = drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
-@CDROM_NONE_TRUE@am__append_31 = drivers/cdrom/cd_none.c
-@JOY_LINUX_TRUE@am__append_32 = drivers/joy_linux.c drivers/joy_linux.h
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@VIDEO_EGL_TRUE@am__append_12 = drivers/video_egl.c drivers/video_egl.h
+@AUDIO_OSX_TRUE@am__append_13 = drivers/audio_osx.m
+@BUILD_PLUGINS_TRUE@am__append_14 = lxdream_dummy.@SOEXT@
+@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__append_15 = audio_sdl.@SOEXT@
+@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__append_16 = audio_pulse.@SOEXT@
+@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__append_17 = audio_esd.@SOEXT@
+@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__append_18 = audio_alsa.@SOEXT@
+@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__append_19 = input_lirc.@SOEXT@
+@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_20 = drivers/audio_sdl.c
+@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_21 = @SDL_LIBS@
+@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_22 = drivers/audio_pulse.c
+@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_23 = @PULSE_LIBS@
+@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_24 = drivers/audio_esd.c
+@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_25 = @ESOUND_LIBS@
+@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_26 = drivers/audio_alsa.c
+@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_27 = @ALSA_LIBS@
+@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_28 = drivers/input_lirc.c
+@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_29 = -llirc_client
+@CDROM_LINUX_TRUE@am__append_30 = drivers/cdrom/cd_linux.c
+@CDROM_OSX_TRUE@am__append_31 = drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
+@CDROM_NONE_TRUE@am__append_32 = drivers/cdrom/cd_none.c
+@JOY_LINUX_TRUE@am__append_33 = drivers/joy_linux.c drivers/joy_linux.h
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -296,11 +297,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_cfg.c \
gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
gtkui/gtk_ctrl.c gtkui/gtk_gd.c drivers/video_gtk.c gui_none.c \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- drivers/video_egl.c drivers/video_egl.h cocoaui/cocoaui.m \
- cocoaui/cocoaui.h cocoaui/cocoa_cfg.m cocoaui/cocoa_win.m \
- cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m cocoaui/cocoa_ctrl.m \
- drivers/video_osx.m drivers/video_gdk.c drivers/video_glx.c \
- drivers/video_glx.h drivers/video_nsgl.m drivers/video_nsgl.h \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
+ cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
+ cocoaui/cocoa_ctrl.m drivers/video_osx.m drivers/video_gdk.c \
+ drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
+ drivers/video_nsgl.h drivers/video_egl.c drivers/video_egl.h \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > drivers/audio_osx.m drivers/audio_sdl.c drivers/audio_pulse.c \
drivers/audio_esd.c drivers/audio_alsa.c drivers/input_lirc.c \
drivers/cdrom/cd_linux.c drivers/cdrom/cd_osx.c \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -318,8 +319,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_GTK_TRUE@ lxdream-gtk_ctrl.$(OBJEXT) \
@GUI_GTK_TRUE@ lxdream-gtk_gd.$(OBJEXT) \
@GUI_GTK_TRUE@ lxdream-video_gtk.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_ANDROID_TRUE@am__objects_6 = lxdream-gui_none.$(OBJEXT) \
-@GUI_ANDROID_TRUE@ lxdream-video_egl.$(OBJEXT)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@am__objects_6 = lxdream-gui_none.$(OBJEXT)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_COCOA_TRUE@am__objects_7 = lxdream-cocoaui.$(OBJEXT) \
@GUI_COCOA_TRUE@ lxdream-cocoa_cfg.$(OBJEXT) \
@GUI_COCOA_TRUE@ lxdream-cocoa_win.$(OBJEXT) \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -330,24 +330,25 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @VIDEO_OSMESA_TRUE@am__objects_8 = lxdream-video_gdk.$(OBJEXT)
@VIDEO_GLX_TRUE@am__objects_9 = lxdream-video_glx.$(OBJEXT)
@VIDEO_NSGL_TRUE@am__objects_10 = lxdream-video_nsgl.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@AUDIO_OSX_TRUE@am__objects_11 = lxdream-audio_osx.$(OBJEXT)
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__objects_12 = lxdream-audio_sdl.$(OBJEXT)
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__objects_13 = lxdream-audio_pulse.$(OBJEXT)
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__objects_14 = lxdream-audio_esd.$(OBJEXT)
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__objects_15 = lxdream-audio_alsa.$(OBJEXT)
-@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__objects_16 = lxdream-input_lirc.$(OBJEXT)
-@CDROM_LINUX_TRUE@am__objects_17 = lxdream-cd_linux.$(OBJEXT)
-@CDROM_OSX_TRUE@am__objects_18 = lxdream-cd_osx.$(OBJEXT) \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@VIDEO_EGL_TRUE@am__objects_11 = lxdream-video_egl.$(OBJEXT)
+@AUDIO_OSX_TRUE@am__objects_12 = lxdream-audio_osx.$(OBJEXT)
+@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__objects_13 = lxdream-audio_sdl.$(OBJEXT)
+@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__objects_14 = lxdream-audio_pulse.$(OBJEXT)
+@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__objects_15 = lxdream-audio_esd.$(OBJEXT)
+@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__objects_16 = lxdream-audio_alsa.$(OBJEXT)
+@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__objects_17 = lxdream-input_lirc.$(OBJEXT)
+@CDROM_LINUX_TRUE@am__objects_18 = lxdream-cd_linux.$(OBJEXT)
+@CDROM_OSX_TRUE@am__objects_19 = lxdream-cd_osx.$(OBJEXT) \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @CDROM_OSX_TRUE@ lxdream-osx_iokit.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@CDROM_NONE_TRUE@am__objects_19 = lxdream-cd_none.$(OBJEXT)
-@JOY_LINUX_TRUE@am__objects_20 = lxdream-joy_linux.$(OBJEXT)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@CDROM_NONE_TRUE@am__objects_20 = lxdream-cd_none.$(OBJEXT)
+@JOY_LINUX_TRUE@am__objects_21 = lxdream-joy_linux.$(OBJEXT)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am_lxdream_OBJECTS = lxdream-main.$(OBJEXT) $(am__objects_4) \
$(am__objects_5) $(am__objects_6) $(am__objects_7) \
$(am__objects_8) $(am__objects_9) $(am__objects_10) \
$(am__objects_11) $(am__objects_12) $(am__objects_13) \
$(am__objects_14) $(am__objects_15) $(am__objects_16) \
$(am__objects_17) $(am__objects_18) $(am__objects_19) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(am__objects_20)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(am__objects_20) $(am__objects_21)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_OBJECTS = $(am_lxdream_OBJECTS)
lxdream_DEPENDENCIES = liblxdream-core.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -576,6 +577,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+VIDEO_EGL_FALSE = @VIDEO_EGL_FALSE@
+VIDEO_EGL_TRUE = @VIDEO_EGL_TRUE@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > VIDEO_GLX_FALSE = @VIDEO_GLX_FALSE@
VIDEO_GLX_TRUE = @VIDEO_GLX_TRUE@
VIDEO_NSGL_FALSE = @VIDEO_NSGL_FALSE@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -655,15 +658,16 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
lxdream_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ $(am__append_20) \
- $(am__append_22) $(am__append_24) $(am__append_26) \
- $(am__append_28)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ $(am__append_21) \
+ $(am__append_23) $(am__append_25) $(am__append_27) \
+ $(am__append_29)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_SOURCES = main.c $(am__append_1) $(am__append_4) \
$(am__append_5) $(am__append_7) $(am__append_9) \
$(am__append_10) $(am__append_11) $(am__append_12) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(am__append_19) $(am__append_21) $(am__append_23) \
- $(am__append_25) $(am__append_27) $(am__append_29) \
- $(am__append_30) $(am__append_31) $(am__append_32)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(am__append_13) $(am__append_20) $(am__append_22) \
+ $(am__append_24) $(am__append_26) $(am__append_28) \
+ $(am__append_30) $(am__append_31) $(am__append_32) \
+ $(am__append_33)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_LIBS = liblxdream-core.a
lxdream_CPPFLAGS = @LXDREAMCPPFLAGS@
noinst_LIBRARIES = liblxdream-core.a
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2516,20 +2520,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-gui_none.obj `if test -f 'gui_none.c'; then $(CYGPATH_W) 'gui_none.c'; else $(CYGPATH_W) '$(srcdir)/gui_none.c'; fi`
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-lxdream-video_egl.o: drivers/video_egl.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-video_egl.o -MD -MP -MF "$(DEPDIR)/lxdream-video_egl.Tpo" -c -o lxdream-video_egl.o `test -f 'drivers/video_egl.c' || echo '$(srcdir)/'`drivers/video_egl.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-video_egl.Tpo" "$(DEPDIR)/lxdream-video_egl.Po"; else rm -f "$(DEPDIR)/lxdream-video_egl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_egl.c' object='lxdream-video_egl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-video_egl.o `test -f 'drivers/video_egl.c' || echo '$(srcdir)/'`drivers/video_egl.c
-
-lxdream-video_egl.obj: drivers/video_egl.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-video_egl.obj -MD -MP -MF "$(DEPDIR)/lxdream-video_egl.Tpo" -c -o lxdream-video_egl.obj `if test -f 'drivers/video_egl.c'; then $(CYGPATH_W) 'drivers/video_egl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_egl.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-video_egl.Tpo" "$(DEPDIR)/lxdream-video_egl.Po"; else rm -f "$(DEPDIR)/lxdream-video_egl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_egl.c' object='lxdream-video_egl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-video_egl.obj `if test -f 'drivers/video_egl.c'; then $(CYGPATH_W) 'drivers/video_egl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_egl.c'; fi`
-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream-video_gdk.o: drivers/video_gdk.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-video_gdk.o -MD -MP -MF "$(DEPDIR)/lxdream-video_gdk.Tpo" -c -o lxdream-video_gdk.o `test -f 'drivers/video_gdk.c' || echo '$(srcdir)/'`drivers/video_gdk.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-video_gdk.Tpo" "$(DEPDIR)/lxdream-video_gdk.Po"; else rm -f "$(DEPDIR)/lxdream-video_gdk.Tpo"; exit 1; fi
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2558,6 +2548,20 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-video_glx.obj `if test -f 'drivers/video_glx.c'; then $(CYGPATH_W) 'drivers/video_glx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_glx.c'; fi`
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+lxdream-video_egl.o: drivers/video_egl.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-video_egl.o -MD -MP -MF "$(DEPDIR)/lxdream-video_egl.Tpo" -c -o lxdream-video_egl.o `test -f 'drivers/video_egl.c' || echo '$(srcdir)/'`drivers/video_egl.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-video_egl.Tpo" "$(DEPDIR)/lxdream-video_egl.Po"; else rm -f "$(DEPDIR)/lxdream-video_egl.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_egl.c' object='lxdream-video_egl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-video_egl.o `test -f 'drivers/video_egl.c' || echo '$(srcdir)/'`drivers/video_egl.c
+
+lxdream-video_egl.obj: drivers/video_egl.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-video_egl.obj -MD -MP -MF "$(DEPDIR)/lxdream-video_egl.Tpo" -c -o lxdream-video_egl.obj `if test -f 'drivers/video_egl.c'; then $(CYGPATH_W) 'drivers/video_egl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_egl.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-video_egl.Tpo" "$(DEPDIR)/lxdream-video_egl.Po"; else rm -f "$(DEPDIR)/lxdream-video_egl.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_egl.c' object='lxdream-video_egl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-video_egl.obj `if test -f 'drivers/video_egl.c'; then $(CYGPATH_W) 'drivers/video_egl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_egl.c'; fi`
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream-audio_sdl.o: drivers/audio_sdl.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-audio_sdl.o -MD -MP -MF "$(DEPDIR)/lxdream-audio_sdl.Tpo" -c -o lxdream-audio_sdl.o `test -f 'drivers/audio_sdl.c' || echo '$(srcdir)/'`drivers/audio_sdl.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-audio_sdl.Tpo" "$(DEPDIR)/lxdream-audio_sdl.Po"; else rm -f "$(DEPDIR)/lxdream-audio_sdl.Tpo"; exit 1; fi
</pre></div>
<hr /><a name="file6" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/drivers</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>gl_sl.c</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/gl_sl.c
+++ lxdream/src/drivers/gl_sl.c
@@ -316,12 +316,12 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-static <span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >static </span>inline GLint glsl_get_uniform_location(gl_program_t program, const char *name)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+static inline GLint glsl_get_uniform_location(gl_program_t program, const char *name)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
return 0;
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-static <span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >static </span>inline GLint glsl_get_attrib_location(gl_program_t program, const char *name)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+static inline GLint glsl_get_attrib_location(gl_program_t program, const char *name)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
return 0;
}
</pre></div>
<hr /><a name="file7" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/drivers</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>video_egl.c</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_egl.c
+++ lxdream/src/drivers/video_egl.c
@@ -72,6 +72,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > EGL_RENDERABLE_TYPE,EGL_OPENGL_ES2_BIT,
EGL_NONE, EGL_NONE };
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+static const EGLint alt_attributes[] = {
+ EGL_DEPTH_SIZE, 16,
+ EGL_STENCIL_SIZE, 8,
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+ EGL_RENDERABLE_TYPE,EGL_OPENGL_ES2_BIT,
+ EGL_NONE, EGL_NONE };
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > static const EGLint context_attributes[] = {
EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE, EGL_NONE };
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -81,60 +88,79 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > static EGLSurface surface = EGL_NO_SURFACE;
static gboolean fbo_created = FALSE;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-gboolean video_egl_set_window(EGLNativeWindowType window, int width, int height, int format)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+static void video_egl_swap_buffers();
+static int video_egl_major = 0, video_egl_minor = 0;
+
+gboolean video_egl_init()
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- EGLConfig config;
- EGLint num_config, major = 0, minor = 0;
- const EGLint *attribute_list;
-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if( eglInitialize(display, &<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >major, &</span>minor) != EGL_TRUE ) {
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if( eglInitialize(display, &<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >video_egl_major, &video_egl_</span>minor) != EGL_TRUE ) {
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > logEGLError( "Unable to initialise EGL display" );
return FALSE;
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ return TRUE;
+}
+
+gboolean video_egl_init_context( EGLNativeWindowType window, int format )
+{
+ EGLConfig config;
+ EGLint num_config;
+ const EGLint *attribute_list;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
if( format == COLFMT_RGB565 || format == COLFMT_BGRA1555 ) {
attribute_list = RGB565_attributes;
} else {
attribute_list = RGB888_attributes;
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ eglChooseConfig(display, attribute_list, &config, 1, &num_config);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ surface = eglCreateWindowSurface(display, config, window, NULL);
+ if( surface == EGL_NO_SURFACE ) {
+ /* Try alternate config in case of failure. This provides a workaround for
+ * the Nokia N900 where eglCreateWindowSurface fails when color attributes
+ * are specified. (bug report: https://bugs.maemo.org/show_bug.cgi?id=9335)
+ */
+ eglChooseConfig(display, alt_attributes, &config, 1, &num_config);
+ surface = eglCreateWindowSurface(display, config, window, NULL);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- eglChooseConfig(display, attribute_list, &config, 1, &num_config);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if( surface == EGL_NO_SURFACE ) {
+ logEGLError( "Unable to create EGL surface" );
+ video_egl_shutdown();
+ return FALSE;
+ }
+ }
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
context = eglCreateContext(display, config, EGL_NO_CONTEXT, context_attributes);
if( context == EGL_NO_CONTEXT ) {
logEGLError( "Unable to create EGL context" );
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_egl_clear_window();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_egl_shutdown();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return FALSE;
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- surface = eglCreateWindowSurface(display, config, window, NULL);
- if( surface == EGL_NO_SURFACE ) {
- logEGLError( "Unable to create EGL surface" );
- video_egl_clear_window();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
+
+ if( eglMakeCurrent( display, surface, surface, context ) == EGL_FALSE ) {
+ logEGLError( "Unable to make EGL context current" );
+ video_egl_shutdown();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return FALSE;
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if( eglMakeCurrent( display, surface, surface, context ) == EGL_FALSE ) {
- logEGLError( "Unable to make EGL context current" );
- video_egl_clear_window();
- return FALSE;
- }
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ return TRUE;
+}
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- display_egl_driver.capabilities.depth_bits = 16; /* TODO: get from config info */
- if( !gl_init_driver(&display_egl_driver, TRUE) ) {
- video_egl_clear_window();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+gboolean video_egl_init_driver( display_driver_t driver )
+{
+ driver->swap_buffers = video_egl_swap_buffers;
<a name="task2" />+ driver->capabilities.depth_bits = 16; /* <span class="task" style="background-color:#ffff00;" >TODO</span>: get from config info */
+ if( !gl_init_driver(driver, TRUE) ) {
+ video_egl_shutdown();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return FALSE;
}
fbo_created = TRUE;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- gl_set_video_size(width, height, 0);
- pvr2_setup_gl_context();
- INFO( "Initialised EGL %d.%d", major, minor );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return TRUE;
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-void video_egl_clear_window()
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void video_egl_shutdown()
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
if( fbo_created ) {
pvr2_shutdown_gl_context();
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -154,6 +180,24 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > eglTerminate(display);
display = EGL_NO_DISPLAY;
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+}
+
+gboolean video_egl_set_window(EGLNativeWindowType window, int width, int height, int format)
+{
+ if( ! video_egl_init() ||
+ ! video_egl_init_context( window, format ) ||
+ ! video_egl_init_driver( &display_egl_driver ) ) {
+ return FALSE;
+ }
+ gl_set_video_size(width, height, 0);
+ pvr2_setup_gl_context();
+ INFO( "Initialised EGL %d.%d", video_egl_major, video_egl_minor );
+ return TRUE;
+}
+
+void video_egl_clear_window()
+{
+ video_egl_shutdown();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > INFO( "Terminated EGL" );
}
</pre></div>
<hr /><a name="file8" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/drivers</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>video_egl.h</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_egl.h
+++ lxdream/src/drivers/video_egl.h
@@ -28,6 +28,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
#include <EGL/egl.h>
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+gboolean video_egl_init();
+gboolean video_egl_init_context(EGLNativeWindowType window, int format);
+gboolean video_egl_init_driver(display_driver_t driver);
+void video_egl_shutdown();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > gboolean video_egl_set_window(EGLNativeWindowType window, int width, int height, int format);
void video_egl_clear_window();
</pre></div>
<hr /><a name="file9" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/drivers</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>video_gtk.c</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_gtk.c
+++ lxdream/src/drivers/video_gtk.c
@@ -114,6 +114,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
#endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#ifdef HAVE_GLES2
+#include "drivers/video_egl.h"
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
GtkWidget *gtk_video_drawable = NULL;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -266,6 +270,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GdkColormap *colormap = gdk_colormap_new( gdkvis, FALSE );
gtk_widget_set_colormap( drawable, colormap );
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#else
+#ifdef HAVE_GLES2
+ if( ! video_egl_init() ) {
+ ERROR( "Unable to initialize EGL, aborting" );
+ exit(3);
+ }
+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #endif
gtk_video_drawable = drawable;
return drawable;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -295,6 +306,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if( ! video_nsgl_init_driver( view, &display_gtk_driver ) ) {
return FALSE;
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#else
+#ifdef HAVE_GLES2
+ Window window = GDK_WINDOW_XWINDOW( GTK_WIDGET(gtk_video_drawable)->window );
+ if( ! video_egl_init_context( window, COLFMT_RGB888 ) ||
+ ! video_egl_init_driver( &display_gtk_driver ) ) {
+ return FALSE;
+ }
+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #endif
#endif
#endif
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -331,6 +350,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #else
#ifdef HAVE_NSGL
video_nsgl_shutdown();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#else
+#ifdef HAVE_GLES2
+ video_egl_shutdown();
+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #endif
#endif
#endif
</pre></div>
<hr /><a name="file10" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/pvr2</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>glutil.h</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glutil.h
+++ lxdream/src/pvr2/glutil.h
@@ -156,6 +156,20 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /* Convenience formatting function for driver use */
void fprint_extensions( FILE *out, const char *extensions );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/****** Texture formats (missing definitions) *****/
+
+#ifndef GL_UNSIGNED_SHORT_4_4_4_4_REV
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#endif
+
+#ifndef GL_UNSIGNED_SHORT_1_5_5_5_REV
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#endif
+
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #ifdef __cplusplus
}
#endif
</pre></div>
<hr /><a name="file11" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/tools</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.am</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/tools/Makefile.am
+++ lxdream/src/tools/Makefile.am
@@ -9,11 +9,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > noinst_PROGRAMS = gendec genglsl genmach
gendec_SOURCES = gendec.c gendec.h insparse.c actparse.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+gendec_LDADD = @GLIB_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >FOR_BUILD_</span>LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
genmach_SOURCES = genmach.c genmach.h mdparse.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-genmach_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+genmach_LDADD = @GLIB_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >FOR_BUILD_</span>LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
genglsl_SOURCES = genglsl.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+genglsl_LDADD = @GLIB_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >FOR_BUILD_</span>LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre></div>
<hr /><a name="file12" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/tools</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.in</b></big> <small id="info" style="color: #888888;" >8376a612a79d -> dac8f363f1fe</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/tools/Makefile.in
+++ lxdream/src/tools/Makefile.in
@@ -224,6 +224,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+VIDEO_EGL_FALSE = @VIDEO_EGL_FALSE@
+VIDEO_EGL_TRUE = @VIDEO_EGL_TRUE@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > VIDEO_GLX_FALSE = @VIDEO_GLX_FALSE@
VIDEO_GLX_TRUE = @VIDEO_GLX_TRUE@
VIDEO_NSGL_FALSE = @VIDEO_NSGL_FALSE@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -283,11 +285,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AM_CPPFLAGS = -I$(top_srcdir)/src $(GLIB_FOR_BUILD_CFLAGS)
AM_LDFLAGS = $(GLIB_FOR_BUILD_LDFLAGS)
gendec_SOURCES = gendec.c gendec.h insparse.c actparse.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+gendec_LDADD = @GLIB_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >FOR_BUILD_</span>LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > genmach_SOURCES = genmach.c genmach.h mdparse.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-genmach_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+genmach_LDADD = @GLIB_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >FOR_BUILD_</span>LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > genglsl_SOURCES = genglsl.c
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+genglsl_LDADD = @GLIB_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >FOR_BUILD_</span>LIBS@ @GTK_LIBS@ $(INTLLIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > all: all-am
.SUFFIXES:
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>