<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">.hgignore</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+7</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">Makefile.am</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+16</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td><tt><a href="#file3">Makefile.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+26</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-5</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>android/<a href="#file4"><span id="addedalt" style="background-color:#ccf7cc;" >AndroidManifest.xml</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+16</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file5"><span id="added" style="background-color:#ddffdd;" >build.xml</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+79</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>android/deps/<a href="#file6"><span id="addedalt" style="background-color:#ccf7cc;" >builddeps.sh</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+79</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file7"><span id="added" style="background-color:#ddffdd;" >config.guess</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+1517</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file8"><span id="addedalt" style="background-color:#ccf7cc;" >config.sub</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+1767</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file9"><span id="added" style="background-color:#ddffdd;" >gettext-0.18.1.1.diff</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+102</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file10"><span id="addedalt" style="background-color:#ccf7cc;" >glib-2.26.0.cache</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+2</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file11"><span id="added" style="background-color:#ddffdd;" >glib-2.26.0.diff</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+57</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file12"><span id="addedalt" style="background-color:#ccf7cc;" >libiconv-1.13.1.diff</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+23</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file13"><span id="added" style="background-color:#ddffdd;" >libisofs-0.6.38.diff</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+78</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>android/gen/org/lxdream/<a href="#file14"><span id="addedalt" style="background-color:#ccf7cc;" >R.java</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+16</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt>android/res/values/<a href="#file15"><span id="added" style="background-color:#ddffdd;" >strings.xml</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+4</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>android/src/org/lxdream/<a href="#file16"><span id="addedalt" style="background-color:#ccf7cc;" >ConfigChooser.java</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+234</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file17"><span id="added" style="background-color:#ddffdd;" >Dreamcast.java</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+49</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file18"><span id="addedalt" style="background-color:#ccf7cc;" >LxdreamActivity.java</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+50</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt> /<a href="#file19"><span id="added" style="background-color:#ddffdd;" >LxdreamView.java</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+150</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file20">config.h.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+3</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td><tt><a href="#file21">configure</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+290</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">91bcb2dec4ef -> be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file22">configure.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+22</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-12</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td><tt>m4/<a href="#file23"><span id="added" style="background-color:#ddffdd;" >android.m4</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+79</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>src/<a href="#file24">Makefile.am</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+9</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td><tt> /<a href="#file25">Makefile.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+119</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-88</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file26">display.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+13</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td><tt> /<a href="#file27">display.h</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+5</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">91bcb2dec4ef -> be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>src/drivers/<a href="#file28">video_gl.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+14</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">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td><tt>src/<a href="#file29"><span id="added" style="background-color:#ddffdd;" >gui_jni.c</span></a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+103</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file30"><span id="addedalt" style="background-color:#ccf7cc;" >gui_none.c</span></a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+58</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" align="right" nowrap="nowrap">added be3121267597</td></tr>
<tr><td><tt>src/tools/<a href="#file31">Makefile.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+9</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">91bcb2dec4ef -> be3121267597</td></tr>
<tr class="alt" style=";" ><td><tt>src/<a href="#file32">util.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+10</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">91bcb2dec4ef -> be3121267597</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+5006</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-132</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >19 added + 13 modified, total 32 files</small><br />
<div class="tasklist" style="padding:4px;border:1px dashed #000000;margin-top:1em;" ><ul>
<li><a href="#task1">FIXME: really hppa2.0-hp</a></li>
<li><a href="#task2">FIXME: really hppa2.0-hp</a></li>
<li><a href="#task3">TODO: Really use the locale. */</a></li>
<li><a href="#task4">FIXME: Need to actually handle this case */</a></li>
<li><a href="#task5">TODO */</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;" >
Android support WIP
</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>.hgignore</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/.hgignore
+++ lxdream/.hgignore
@@ -6,12 +6,17 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > .*\~
.*\.gmo
.*\.mo
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+.*\.class
+.*\.apk
+.*\.ap_
+classes.dex
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > autom4te.cache
Makefile
config.h
config.status
lxdream.1
lxdream.app
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+gdbserver
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > Info.plist
stamp-h1
lxdream-.*.tar.gz
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -28,6 +33,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > src/sh4/sh4x86.c
src/version.c
src/lxdream
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+src/liblxdream-core.a
+src/liblxdream.so
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > src/testsh4x86
src/test/.dirstamp
src/test/testsh4x86
</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>Makefile.am</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.am
+++ lxdream/Makefile.am
@@ -98,3 +98,19 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @echo --- Done ---
bundle: all
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
+if GUI_ANDROID
+Lxdream-debug.apk: src/liblxdream.so
+ $(mkdir_p) android/libs/armeabi
+ $(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
+ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
+ $(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
+ (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
+ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
+ -Dout.dir="$$TARGETDIR" \
+ -Dnative.libs.dir="$$TARGETDIR/libs" \
+ -Dtarget=$(ANDROID_SDK_VERSION) debug )
+ cp android/Lxdream-debug.apk Lxdream-debug.apk
+
+all-local: Lxdream-debug.apk
+endif
</pre></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>Makefile.in</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.in
+++ lxdream/Makefile.in
@@ -40,13 +40,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > $(srcdir)/Info.plist.in $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- COPYING ChangeLog INSTALL NEWS TODO acconfig.h compile \
- config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ COPYING ChangeLog INSTALL NEWS acconfig.h compile config.guess \
+ config.sub depcomp install-sh missing mkinstalldirs
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >configure.in</span>
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >m4/android.m4 \</span>
+ $(top_srcdir)/configure.in
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -94,6 +94,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
+ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
+ANDROID_SDK_HOME = @ANDROID_SDK_HOME@
+ANDROID_SDK_VERSION = @ANDROID_SDK_VERSION@
+ANT = @ANT@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ARMCC = @ARMCC@
ARMLD = @ARMLD@
ARMOBJCOPY = @ARMOBJCOPY@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -162,6 +167,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+GUI_ANDROID_FALSE = @GUI_ANDROID_FALSE@
+GUI_ANDROID_TRUE = @GUI_ANDROID_TRUE@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GUI_COCOA_FALSE = @GUI_COCOA_FALSE@
GUI_COCOA_TRUE = @GUI_COCOA_TRUE@
GUI_GTK_FALSE = @GUI_GTK_FALSE@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -697,7 +704,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > exit 1; } >&2
check-am: all-am
check: check-recursive
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_COCOA_FALSE@all-local:
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_FALSE@@GUI_COCOA_FALSE@all-local:
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > all-am: Makefile $(MANS) $(DATA) config.h all-local
installdirs: installdirs-recursive
installdirs-am:
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -881,6 +888,20 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @echo --- Done ---
bundle: all
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
+@GUI_ANDROID_TRUE@Lxdream-debug.apk: src/liblxdream.so
+@GUI_ANDROID_TRUE@ $(mkdir_p) android/libs/armeabi
+@GUI_ANDROID_TRUE@ $(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
+@GUI_ANDROID_TRUE@ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
+@GUI_ANDROID_TRUE@ $(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
+@GUI_ANDROID_TRUE@ (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
+@GUI_ANDROID_TRUE@ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
+@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" \
+@GUI_ANDROID_TRUE@ -Dnative.libs.dir="$$TARGETDIR/libs" \
+@GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) debug )
+@GUI_ANDROID_TRUE@ cp android/Lxdream-debug.apk Lxdream-debug.apk
+
+@GUI_ANDROID_TRUE@all-local: Lxdream-debug.apk
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
</pre></div>
<hr /><a name="file4" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>AndroidManifest.xml</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/AndroidManifest.xml
+++ lxdream/android/AndroidManifest.xml
@@ -0,0 +1,16 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.lxdream">
+ <application android:label="@string/lxdream_activity">
+ <activity android:name="LxdreamActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:launchMode="singleTask"
+ android:configChanges="orientation|keyboardHidden">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+ <uses-feature android:glEsVersion="0x00020000"/>
+ <uses-sdk android:minSdkVersion="8"/>
+</manifest>
</pre></div>
<hr /><a name="file5" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>build.xml</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/build.xml
+++ lxdream/android/build.xml
@@ -0,0 +1,79 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Lxdream" default="help">
+
+<!-- The local.properties file is created and updated by the 'android'
+ tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
+ <property file="local.properties" />
+
+ <!-- The build.properties file can be created by you and is never touched
+ by the 'android' tool. This is the place to change some of the
+ default property values used by the Ant rules.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ -->
+ <property file="build.properties" />
+
+ <!-- The default.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <property file="default.properties" />
+
+
+ <!-- Required pre-setup import -->
+ <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+ in between standard targets -->
+<!--
+ <target name="-pre-build">
+ </target>
+ <target name="-pre-compile">
+ </target>
+
+ [This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir}]
+ <target name="-post-compile">
+ </target>
+-->
+
+ <!-- Execute the Android Setup task that will setup some properties
+ specific to the target, and import the build rules files.
+
+ The rules file is imported from
+ <SDK>/tools/ant/
+ Depending on the project type it can be either:
+ - main_rules.xml
+ - lib_rules.xml
+ - test_rules.xml
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <setup> task.
+ - customize it to your needs.
+ - Customize the whole script.
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, *after* the <setup> task
+ - disable the import of the rules by changing the setup task
+ below to <setup import="false" />.
+ - customize to your needs.
+ -->
+ <setup />
+
+</project>
</pre></div>
<hr /><a name="file6" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>builddeps.sh</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/builddeps.sh
+++ lxdream/android/deps/builddeps.sh
@@ -0,0 +1,79 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#!/bin/sh
+
+TAR=tar
+PATCH=patch
+MAKE=make
+WGET=wget
+
+GETTEXT=gettext-0.18.1.1
+LIBICONV=libiconv-1.13.1
+LIBPNG=libpng-1.4.3
+LIBISOFS=libisofs-0.6.38
+GLIB=glib-2.26.0
+
+TARGETPREFIX="${HOME}/android/usr"
+NDK_BINDIR="${HOME}/lxdream/android/arm-linux-androideabi-4.4.3/bin"
+PATH="${NDK_BINDIR}:$PATH"
+export PATH
+BUILDALIAS=`gcc -dumpmachine`
+
+if [ ! -e $TARGETPREFIX/lib/libiconv.a ]; then
+ ${WGET} http://ftp.gnu.org/gnu/libiconv/${LIBCONV}.tar.gz
+ ${TAR} -xzf ${LIBCONV}.tar.gz
+ cp config.guess config.sub ${LIBCONV}/build-aux
+ cp config.guess config.sub ${LIBCONV}/libcharset/build-aux
+ ${PATCH} -p0 < libiconv-1.13.1.diff
+ mkdir -p build-${LIBCONV}
+ cd build-${LIBCONV}
+ ../${LIBCONV}/configure --prefix=$TARGETPREFIX --build=$BUILDALIAS --host=arm-linux-androideabi --disable-shared 'CPPFLAGS=-fPIC'
+ ${MAKE} all install
+ cd ..
+fi
+
+if [ ! -e $TARGETPREFIX/lib/libgettextpo.a ]; then
+ ${WGET} http://ftp.gnu.org/gnu/getttext/${GETTEXT}.tar.gz
+ ${TAR} -xzf ${GETTEXT}.tar.gz
+ ${PATCH} -p0 < ${GETTEXT}.diff
+ mkdir -p build-${GETTEXT}
+ cd build-${GETTEXT}
+ ../${GETTEXT}/configure --prefix=$TARGETPREFIX --build=$BUILDALIAS --host=arm-linux-androideabi --disable-shared "CPPFLAGS=-I$TARGETPREFIX/include -fPIC" "LDFLAGS=-L$TARGETPREFIX/lib"
+ ${MAKE} all install
+ cd ..
+fi
+
+if [ ! -e $TARGETPREFIX/lib/libpng14.a ]; then
+ ${WGET} http://sourceforge.net/projects/libpng/files/libpng14/older-releases/1.4.3/${LIBPNG}.tar.gz/download
+ ${TAR} -xzf ${LIBPNG}.tar.gz
+ cp config.guess config.sub ${LIBPNG}
+ mkdir -p build-${LIBPNG}
+ cd build-${LIBPNG}
+ ../${LIBPNG}/configure --prefix=$TARGETPREFIX --build=$BUILDALIAS --host=arm-linux-androideabi --disable-shared "CPPFLAGS=-I$TARGETPREFIX/include -fPIC" "LDFLAGS=-L$TARGETPREFIX/lib"
+ ${MAKE} all install
+ cd ..
+fi
+
+if [ ! -e $TARGETPREFIX/lib/libisofs.a ]; then
+ ${WGET} http://files.libburnia-project.org/releases/${LIBISOFS}.tar.gz
+ ${TAR} -xzf ${LIBISOFS}.tar.gz
+ cp config.guess config.sub ${LIBISOFS}
+ ${PATCH} -p0 < ${LIBISOFS}.diff
+ cd ${LIBISOFS}
+ ./configure --prefix=$TARGETPREFIX --build=$BUILDALIAS --host=arm-linux-androideabi --disable-shared "CPPFLAGS=-I$TARGETPREFIX/include -fPIC" "LDFLAGS=-L$TARGETPREFIX/lib" LIBISOFS_ASSUME_ICONV=yes
+ ${MAKE} all install THREAD_LIBS=
+ cd ..
+fi
+
+if [ ! -e $TARGETPREFIX/lib/libglib-2.0.a ]; then
+ ${WGET} http://ftp.gnome.org/pub/gnome/sources/glib/2.26/${GLIB}.tar.bz2
+ ${TAR} -xjf ${GLIB}.tar.bz2
+ cp config.guess config.sub ${GLIB}
+ ${PATCH} -p0 < ${GLIB}.diff
+ mkdir -p build-${GLIB}
+ cp ${GLIB}.cache build-${GLIB}
+ cd build-${GLIB}
+ ../${GLIB}/configure --prefix=$TARGETPREFIX --build=$BUILDALIAS --host=arm-linux-androideabi --disable-shared "CPPFLAGS=-I$TARGETPREFIX/include -fPIC" "LDFLAGS=-L$TARGETPREFIX/lib" \
+ --cache-file=${GLIB}.cache --without-threads
+ ${MAKE} install
+ cd ..
+fi
+
</pre></div>
<hr /><a name="file7" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>config.guess</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/config.guess
+++ lxdream/android/deps/config.guess
@@ -0,0 +1,1517 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
+
+timestamp='2011-06-03'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit ;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+ exit ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep -q __LP64__
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo unknown-hitachi-hiuxwe2
+ exit ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+ exit ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=${UNAME_MACHINE}
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+ exit ;;
</pre></pre>
<strong class="error" style="color:red;" >[truncated at 1000 lines; 520 more skipped]</strong>
</div>
<hr /><a name="file8" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>config.sub</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/config.sub
+++ lxdream/android/deps/config.sub
@@ -0,0 +1,1767 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
+
+timestamp='2011-10-29'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit ;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
+ -bluegene*)
+ os=-cnk
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
+ | ns16k | ns32k \
+ | open8 \
+ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+ | rl78 | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
+
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64octeon-* | mips64octeonel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile*-* \
+ | tron-* \
+ | ubicom32-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | j90)
+ basic_machine=j90-cray
+ os=-unicos
+ ;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16 | cr16-*)
+ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
<a name="task1" />+ # <span class="task" style="background-color:#ffff00;" >FIXME</span>: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
<a name="task2" />+ # <span class="task" style="background-color:#ffff00;" >FIXME</span>: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i*86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i*86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i*86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ openrisc | openrisc-*)
+ basic_machine=or32-unknown
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2 | pentiumiii | pentium3)
+ basic_machine=i686-pc
+ ;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc | ppcbe) basic_machine=powerpc-unknown
+ ;;
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
</pre></pre>
<strong class="error" style="color:red;" >[truncated at 1000 lines; 770 more skipped]</strong>
</div>
<hr /><a name="file9" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>gettext-0.18.1.1.diff</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/gettext-0.18.1.1.diff
+++ lxdream/android/deps/gettext-0.18.1.1.diff
@@ -0,0 +1,102 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+diff -ur gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h
+--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h 2010-04-25 19:20:42.000000000 +1000
++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h 2012-02-16 09:06:32.000000000 +1000
+@@ -33,6 +33,13 @@
+ <inttypes.h>. */
+ #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
++/* On Android (Bionic libc), <sys/types.h> includes this file before
++ having defined 'time_t'. Therefore in this case avoid including
++ other system header files; just include the system's <stdint.h>. */
++#if defined __ANDROID__
++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
++#else
++
+ /* Get those types that are already defined in other system include
+ files, so that we can "#define int8_t signed char" below without
+ worrying about a later system include file containing a "typedef
+@@ -566,3 +573,4 @@
+
+ #endif /* _GL_STDINT_H */
+ #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
++#endif /* !(defined __ANDROID__) */
+diff -ur gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h
+--- gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h 2010-05-24 19:42:46.000000000 +1000
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h 2012-02-16 09:06:53.000000000 +1000
+@@ -33,6 +33,13 @@
+ <inttypes.h>. */
+ #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
++/* On Android (Bionic libc), <sys/types.h> includes this file before
++ having defined 'time_t'. Therefore in this case avoid including
++ other system header files; just include the system's <stdint.h>. */
++#if defined __ANDROID__
++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
++#else
++
+ /* Get those types that are already defined in other system include
+ files, so that we can "#define int8_t signed char" below without
+ worrying about a later system include file containing a "typedef
+@@ -566,3 +573,4 @@
+
+ #endif /* _GL_STDINT_H */
+ #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
++#endif /* !(defined __ANDROID__) */
+diff -ur gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h
+--- gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h 2010-04-25 19:22:40.000000000 +1000
++++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h 2012-02-16 09:07:10.000000000 +1000
+@@ -33,6 +33,13 @@
+ <inttypes.h>. */
+ #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
++/* On Android (Bionic libc), <sys/types.h> includes this file before
++ having defined 'time_t'. Therefore in this case avoid including
++ other system header files; just include the system's <stdint.h>. */
++#if defined __ANDROID__
++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
++#else
++
+ /* Get those types that are already defined in other system include
+ files, so that we can "#define int8_t signed char" below without
+ worrying about a later system include file containing a "typedef
+@@ -566,3 +573,4 @@
+
+ #endif /* _GL_STDINT_H */
+ #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
++#endif /* !(defined __ANDROID__) */
+diff -ur gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c
+--- gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c 2010-05-25 00:49:26.000000000 +1000
++++ gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c 2012-02-16 17:42:53.000000000 +1000
+@@ -142,9 +142,17 @@
+ # endif
+ /* nl_langinfo items of the LC_NUMERIC category */
+ case RADIXCHAR:
++#ifdef __ANDROID__
++ return ".";
++#else
+ return localeconv () ->decimal_point;
++#endif
+ case THOUSEP:
++#ifdef __ANDROID__
++ return ",";
++#else
+ return localeconv () ->thousands_sep;
++#endif
+ /* nl_langinfo items of the LC_TIME category.
<a name="task3" />+ <span class="task" style="background-color:#ffff00;" >TODO</span>: Really use the locale. */
+ case D_T_FMT:
+diff -ur gettext-0.18.1.1/gettext-tools/src/msginit.c gettext-0.18.1.1/gettext-tools/src/msginit.c
+--- gettext-0.18.1.1/gettext-tools/src/msginit.c 2010-06-06 22:49:58.000000000 +1000
++++ gettext-0.18.1.1/gettext-tools/src/msginit.c 2012-02-16 17:44:33.000000000 +1000
+@@ -1081,7 +1081,11 @@
+ char *result;
+
+ /* Return the pw_gecos field, upto the first comma (if any). */
++#ifdef __ANDROID__
++ fullname = pwd->pw_name;
++#else
+ fullname = pwd->pw_gecos;
++#endif
+ fullname_end = strchr (fullname, ',');
+ if (fullname_end == NULL)
+ fullname_end = fullname + strlen (fullname);
</pre></div>
<hr /><a name="file10" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>glib-2.26.0.cache</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/glib-2.26.0.cache
+++ lxdream/android/deps/glib-2.26.0.cache
@@ -0,0 +1,2 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+glib_cv_stack_grows=no
+glib_cv_uscore=no
</pre></div>
<hr /><a name="file11" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>glib-2.26.0.diff</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/glib-2.26.0.diff
+++ lxdream/android/deps/glib-2.26.0.diff
@@ -0,0 +1,57 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+diff -ur glib-2.26.0/glib/gstrfuncs.c glib-2.26.0/glib/gstrfuncs.c
+--- glib-2.26.0/glib/gstrfuncs.c 2010-09-14 01:57:51.000000000 +1000
++++ glib-2.26.0/glib/gstrfuncs.c 2012-02-16 17:36:27.000000000 +1000
+@@ -442,8 +442,12 @@
+
+ fail_pos = NULL;
+
++#ifdef __ANDROID__
++ decimal_point = ".";
++#else
+ locale_data = localeconv ();
+ decimal_point = locale_data->decimal_point;
++#endif
+ decimal_point_len = strlen (decimal_point);
+
+ g_assert (decimal_point_len != 0);
+@@ -656,8 +660,12 @@
+
+ _g_snprintf (buffer, buf_len, format, d);
+
++#ifdef __ANDROID__
++ decimal_point = ".";
++#else
+ locale_data = localeconv ();
+ decimal_point = locale_data->decimal_point;
++#endif
+ decimal_point_len = strlen (decimal_point);
+
+ g_assert (decimal_point_len != 0);
+diff -ur glib-2.26.0/glib/gutils.c glib-2.26.0/glib/gutils.c
+--- glib-2.26.0/glib/gutils.c 2010-09-14 01:57:51.000000000 +1000
++++ glib-2.26.0/glib/gutils.c 2012-02-16 17:35:33.000000000 +1000
+@@ -1694,14 +1694,12 @@
+
+ if (!pw)
+ {
+- setpwent ();
+ pw = getpwuid (getuid ());
+- endpwent ();
+ }
+ if (pw)
+ {
+ g_user_name = g_strdup (pw->pw_name);
+-
++#ifndef __ANDROID__
+ if (pw->pw_gecos && *pw->pw_gecos != '\0')
+ {
+ gchar **gecos_fields;
+@@ -1715,7 +1713,7 @@
+ g_strfreev (gecos_fields);
+ g_strfreev (name_parts);
+ }
+-
++#endif
+ if (!g_home_dir)
+ g_home_dir = g_strdup (pw->pw_dir);
+ }
</pre></div>
<hr /><a name="file12" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>libiconv-1.13.1.diff</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/libiconv-1.13.1.diff
+++ lxdream/android/deps/libiconv-1.13.1.diff
@@ -0,0 +1,23 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+diff -ur libiconv-1.13.1/srclib/stdint.in.h /Users/nkeynes/src/libiconv-1.13.1/srclib/stdint.in.h
+--- libiconv-1.13.1-orig/srclib/stdint.in.h 2009-06-21 21:31:08.000000000 +1000
++++ libiconv-1.13.1/srclib/stdint.in.h 2012-02-16 09:57:24.000000000 +1000
+@@ -29,6 +29,13 @@
+ <inttypes.h>. */
+ #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
++/* On Android (Bionic libc), <sys/types.h> includes this file before
++ having defined 'time_t'. Therefore in this case avoid including
++ other system header files; just include the system's <stdint.h>. */
++#if defined __ANDROID__
++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
++#else
++
+ /* Get those types that are already defined in other system include
+ files, so that we can "#define int8_t signed char" below without
+ worrying about a later system include file containing a "typedef
+@@ -565,3 +572,4 @@
+
+ #endif /* _GL_STDINT_H */
+ #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
++#endif /* !__ANDROID__ */
+\ No newline at end of file
</pre></div>
<hr /><a name="file13" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/deps</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>libisofs-0.6.38.diff</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/deps/libisofs-0.6.38.diff
+++ lxdream/android/deps/libisofs-0.6.38.diff
@@ -0,0 +1,78 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+diff -ur libisofs-0.6.38/demo/demo.c libisofs-0.6.38/demo/demo.c
+--- libisofs-0.6.38/demo/demo.c 2010-08-31 19:24:04.000000000 +1000
++++ libisofs-0.6.38/demo/demo.c 2012-02-16 18:07:47.000000000 +1000
+@@ -311,7 +311,7 @@
+
+ fp = fopen(argv[optind+1], "w");
+ if (fp == NULL) {
+- err(1, "error opening output file");
++ fprintf(stderr, "error opening output file");
+ goto ex;
+ }
+
+@@ -639,7 +639,7 @@
+
+ fp = fopen(argv[3], "w");
+ if (fp == NULL) {
+- err(1, "error opening output file");
++ fprintf(stderr, "error opening output file");
+ goto ex;
+ }
+
+@@ -749,7 +749,7 @@
+
+ fp = fopen(argv[5], "w");
+ if (!fp) {
+- err(1, "error opening output file");
++ fprintf(stderr, "error opening output file");
+ goto ex;
+ }
+
+diff -ur libisofs-0.6.38/libisofs/ecma119.c libisofs-0.6.38/libisofs/ecma119.c
+--- libisofs-0.6.38/libisofs/ecma119.c 2010-10-19 20:41:15.000000000 +1000
++++ libisofs-0.6.38/libisofs/ecma119.c 2012-02-16 17:57:46.000000000 +1000
+@@ -38,7 +38,7 @@
+ #include <time.h>
+ #include <string.h>
+ #include <locale.h>
+-#include <langinfo.h>
++//#include <langinfo.h>
+ #include <stdio.h>
+
+ #ifdef Xorriso_standalonE
+diff -ur libisofs-0.6.38/libisofs/fs_image.c libisofs-0.6.38/libisofs/fs_image.c
+--- libisofs-0.6.38/libisofs/fs_image.c 2010-08-31 20:05:09.000000000 +1000
++++ libisofs-0.6.38/libisofs/fs_image.c 2012-02-16 17:53:29.000000000 +1000
+@@ -30,7 +30,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+-#include <langinfo.h>
++//#include <langinfo.h>
+ #include <limits.h>
+ #include <stdio.h>
+
+diff -ur libisofs-0.6.38/libisofs/util.c libisofs-0.6.38/libisofs/util.c
+--- libisofs-0.6.38/libisofs/util.c 2010-05-29 06:33:28.000000000 +1000
++++ libisofs-0.6.38/libisofs/util.c 2012-02-16 17:57:28.000000000 +1000
+@@ -27,7 +27,7 @@
+ #include <limits.h>
+ #include <iconv.h>
+ #include <locale.h>
+-#include <langinfo.h>
++//#include <langinfo.h>
+
+ #include <unistd.h>
+
+@@ -185,7 +185,11 @@
+ {
+ if(libisofs_local_charset[0])
+ return libisofs_local_charset;
++#ifdef __ANDROID__
++ return "UTF-8";
++#else
+ return nl_langinfo(CODESET);
++#endif
+ }
+
+ int strconv(const char *str, const char *icharset, const char *ocharset,
</pre></div>
<hr /><a name="file14" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/gen/org/lxdream</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>R.java</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/gen/org/lxdream/R.java
+++ lxdream/android/gen/org/lxdream/R.java
@@ -0,0 +1,16 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package org.lxdream;
+
+public final class R {
+ public static final class attr {
+ }
+ public static final class string {
+ public static final int lxdream_activity=0x7f020000;
+ }
+}
</pre></div>
<hr /><a name="file15" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/res/values</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>strings.xml</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/res/values/strings.xml
+++ lxdream/android/res/values/strings.xml
@@ -0,0 +1,4 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="lxdream_activity">Lxdream</string>
+</resources>
</pre></div>
<hr /><a name="file16" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/src/org/lxdream</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>ConfigChooser.java</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/src/org/lxdream/ConfigChooser.java
+++ lxdream/android/src/org/lxdream/ConfigChooser.java
@@ -0,0 +1,234 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * $Id$
+ *
+ * GL config chooser. Derived from android ndk gl2jni sample code.
+ *
+ * Copyright (c) 2011 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+package org.lxdream;
+
+import android.opengl.GLSurfaceView;
+import android.util.Log;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+/*
+ * Copyright (C) 2008,2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConfigChooser implements GLSurfaceView.EGLConfigChooser {
+ private final static String TAG = "ConfigChooser";
+
+ public ConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
+ mRedSize = r;
+ mGreenSize = g;
+ mBlueSize = b;
+ mAlphaSize = a;
+ mDepthSize = depth;
+ mStencilSize = stencil;
+ }
+
+ /* This EGL config specification is used to specify 2.0 rendering.
+ * We use a minimum size of 4 bits for red/green/blue, but will
+ * perform actual matching in chooseConfig() below.
+ */
+ private static int EGL_OPENGL_ES2_BIT = 4;
+ private static int[] s_configAttribs2 =
+ {
+ EGL10.EGL_RED_SIZE, 4,
+ EGL10.EGL_GREEN_SIZE, 4,
+ EGL10.EGL_BLUE_SIZE, 4,
+ EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+ EGL10.EGL_NONE
+ };
+
+ public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
+
+ /* Get the number of minimally matching EGL configurations
+ */
+ int[] num_config = new int[1];
+ egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
+
+ int numConfigs = num_config[0];
+
+ if (numConfigs <= 0) {
+ throw new IllegalArgumentException("No configs match configSpec");
+ }
+
+ /* Allocate then read the array of minimally matching EGL configs
+ */
+ EGLConfig[] configs = new EGLConfig[numConfigs];
+ egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs, num_config);
+
+ /* Now return the "best" one
+ */
+ return chooseConfig(egl, display, configs);
+ }
+
+ public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
+ EGLConfig[] configs) {
+ for(EGLConfig config : configs) {
+ int d = findConfigAttrib(egl, display, config,
+ EGL10.EGL_DEPTH_SIZE, 0);
+ int s = findConfigAttrib(egl, display, config,
+ EGL10.EGL_STENCIL_SIZE, 0);
+
+ // We need at least mDepthSize and mStencilSize bits
+ if (d < mDepthSize || s < mStencilSize)
+ continue;
+
+ // We want an *exact* match for red/green/blue/alpha
+ int r = findConfigAttrib(egl, display, config,
+ EGL10.EGL_RED_SIZE, 0);
+ int g = findConfigAttrib(egl, display, config,
+ EGL10.EGL_GREEN_SIZE, 0);
+ int b = findConfigAttrib(egl, display, config,
+ EGL10.EGL_BLUE_SIZE, 0);
+ int a = findConfigAttrib(egl, display, config,
+ EGL10.EGL_ALPHA_SIZE, 0);
+
+ if (r == mRedSize && g == mGreenSize && b == mBlueSize && a == mAlphaSize)
+ return config;
+ }
+ return null;
+ }
+
+ private int findConfigAttrib(EGL10 egl, EGLDisplay display,
+ EGLConfig config, int attribute, int defaultValue) {
+
+ if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
+ return mValue[0];
+ }
+ return defaultValue;
+ }
+
+ public void printConfigs(EGL10 egl, EGLDisplay display,
+ EGLConfig[] configs) {
+ int numConfigs = configs.length;
+ Log.w(TAG, String.format("%d configurations", numConfigs));
+ for (int i = 0; i < numConfigs; i++) {
+ Log.w(TAG, String.format("Configuration %d:\n", i));
+ printConfig(egl, display, configs[i]);
+ }
+ }
+
+ public void printConfig(EGL10 egl, EGLDisplay display,
+ EGLConfig config) {
+ int[] attributes = {
+ EGL10.EGL_BUFFER_SIZE,
+ EGL10.EGL_ALPHA_SIZE,
+ EGL10.EGL_BLUE_SIZE,
+ EGL10.EGL_GREEN_SIZE,
+ EGL10.EGL_RED_SIZE,
+ EGL10.EGL_DEPTH_SIZE,
+ EGL10.EGL_STENCIL_SIZE,
+ EGL10.EGL_CONFIG_CAVEAT,
+ EGL10.EGL_CONFIG_ID,
+ EGL10.EGL_LEVEL,
+ EGL10.EGL_MAX_PBUFFER_HEIGHT,
+ EGL10.EGL_MAX_PBUFFER_PIXELS,
+ EGL10.EGL_MAX_PBUFFER_WIDTH,
+ EGL10.EGL_NATIVE_RENDERABLE,
+ EGL10.EGL_NATIVE_VISUAL_ID,
+ EGL10.EGL_NATIVE_VISUAL_TYPE,
+ 0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
+ EGL10.EGL_SAMPLES,
+ EGL10.EGL_SAMPLE_BUFFERS,
+ EGL10.EGL_SURFACE_TYPE,
+ EGL10.EGL_TRANSPARENT_TYPE,
+ EGL10.EGL_TRANSPARENT_RED_VALUE,
+ EGL10.EGL_TRANSPARENT_GREEN_VALUE,
+ EGL10.EGL_TRANSPARENT_BLUE_VALUE,
+ 0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
+ 0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
+ 0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
+ 0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
+ EGL10.EGL_LUMINANCE_SIZE,
+ EGL10.EGL_ALPHA_MASK_SIZE,
+ EGL10.EGL_COLOR_BUFFER_TYPE,
+ EGL10.EGL_RENDERABLE_TYPE,
+ 0x3042 // EGL10.EGL_CONFORMANT
+ };
+ String[] names = {
+ "EGL_BUFFER_SIZE",
+ "EGL_ALPHA_SIZE",
+ "EGL_BLUE_SIZE",
+ "EGL_GREEN_SIZE",
+ "EGL_RED_SIZE",
+ "EGL_DEPTH_SIZE",
+ "EGL_STENCIL_SIZE",
+ "EGL_CONFIG_CAVEAT",
+ "EGL_CONFIG_ID",
+ "EGL_LEVEL",
+ "EGL_MAX_PBUFFER_HEIGHT",
+ "EGL_MAX_PBUFFER_PIXELS",
+ "EGL_MAX_PBUFFER_WIDTH",
+ "EGL_NATIVE_RENDERABLE",
+ "EGL_NATIVE_VISUAL_ID",
+ "EGL_NATIVE_VISUAL_TYPE",
+ "EGL_PRESERVED_RESOURCES",
+ "EGL_SAMPLES",
+ "EGL_SAMPLE_BUFFERS",
+ "EGL_SURFACE_TYPE",
+ "EGL_TRANSPARENT_TYPE",
+ "EGL_TRANSPARENT_RED_VALUE",
+ "EGL_TRANSPARENT_GREEN_VALUE",
+ "EGL_TRANSPARENT_BLUE_VALUE",
+ "EGL_BIND_TO_TEXTURE_RGB",
+ "EGL_BIND_TO_TEXTURE_RGBA",
+ "EGL_MIN_SWAP_INTERVAL",
+ "EGL_MAX_SWAP_INTERVAL",
+ "EGL_LUMINANCE_SIZE",
+ "EGL_ALPHA_MASK_SIZE",
+ "EGL_COLOR_BUFFER_TYPE",
+ "EGL_RENDERABLE_TYPE",
+ "EGL_CONFORMANT"
+ };
+ int[] value = new int[1];
+ for (int i = 0; i < attributes.length; i++) {
+ int attribute = attributes[i];
+ String name = names[i];
+ if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
+ Log.w(TAG, String.format(" %s: %d\n", name, value[0]));
+ } else {
+ // Log.w(TAG, String.format(" %s: failed\n", name));
+ while (egl.eglGetError() != EGL10.EGL_SUCCESS);
+ }
+ }
+ }
+
+ // Subclasses can adjust these values:
+ protected int mRedSize;
+ protected int mGreenSize;
+ protected int mBlueSize;
+ protected int mAlphaSize;
+ protected int mDepthSize;
+ protected int mStencilSize;
+ private int[] mValue = new int[1];
+}
</pre></div>
<hr /><a name="file17" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/src/org/lxdream</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>Dreamcast.java</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/src/org/lxdream/Dreamcast.java
+++ lxdream/android/src/org/lxdream/Dreamcast.java
@@ -0,0 +1,49 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * $Id$
+ *
+ * Main Lxdream activity
+ *
+ * Copyright (c) 2011 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+package org.lxdream;
+
+public class Dreamcast {
+
+ static {
+ System.loadLibrary("lxdream");
+ }
+
+ /* Core emulation */
+ public static native void init();
+ public static native void setViewSize(int width, int height);
+ public static native void run();
+ public static native void stop();
+ /*
+ public static native void start();
+ public static native void run_slice();
+ public static boolean canRun();
+*/
+ /* Save state management */
+/* public static native boolean saveState( String filename );
+ public static native boolean loadState( String filename );
+ public static native boolean quickSave();
+ public static native boolean quickLoad();
+ public static native void setQuickState(int state);
+ */
+ /* GD-Rom */
+/* public static native boolean mount_disc( String filename );
+ public static native void unmount_disc();
+ */
+ /* ... */
+}
</pre></div>
<hr /><a name="file18" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/src/org/lxdream</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>LxdreamActivity.java</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/src/org/lxdream/LxdreamActivity.java
+++ lxdream/android/src/org/lxdream/LxdreamActivity.java
@@ -0,0 +1,50 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * $Id$
+ *
+ * Main Lxdream activity
+ *
+ * Copyright (c) 2011 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+package org.lxdream;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.WindowManager;
+
+import java.io.File;
+
+
+public class LxdreamActivity extends Activity {
+ LxdreamView view;
+
+ @Override
+ protected void onCreate(Bundle bundle) {
+ super.onCreate(bundle);
+ view = new LxdreamView(getApplication());
+ setContentView(view);
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ view.onPause();
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ view.onResume();
+ }
+}
</pre></div>
<hr /><a name="file19" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/android/src/org/lxdream</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>LxdreamView.java</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/android/src/org/lxdream/LxdreamView.java
+++ lxdream/android/src/org/lxdream/LxdreamView.java
@@ -0,0 +1,150 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * $Id$
+ *
+ * Lxdream GL view. Derived from android
+ *
+ * Copyright (c) 2011 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+package org.lxdream;
+/*
+ * Copyright (C) 2008,2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.opengl.GLSurfaceView;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * A simple GLSurfaceView sub-class that demonstrate how to perform
+ * OpenGL ES 2.0 rendering into a GL Surface. Note the following important
+ * details:
+ *
+ * - The class must use a custom context factory to enable 2.0 rendering.
+ * See ContextFactory class definition below.
+ *
+ * - The class must use a custom EGLConfigChooser to be able to select
+ * an EGLConfig that supports 2.0. This is done by providing a config
+ * specification to eglChooseConfig() that has the attribute
+ * EGL10.ELG_RENDERABLE_TYPE containing the EGL_OPENGL_ES2_BIT flag
+ * set. See ConfigChooser class definition below.
+ *
+ * - The class must select the surface's format, then choose an EGLConfig
+ * that matches it exactly (with regards to red/green/blue/alpha channels
+ * bit depths). Failure to do so would result in an EGL_BAD_MATCH error.
+ */
+class LxdreamView extends GLSurfaceView {
+ private static String TAG = "LxdreamView";
+ private static final boolean DEBUG = false;
+
+ public LxdreamView(Context context) {
+ super(context);
+ init(false, 0, 0);
+ }
+
+ public LxdreamView(Context context, boolean translucent, int depth, int stencil) {
+ super(context);
+ init(translucent, depth, stencil);
+ }
+
+ private void init(boolean translucent, int depth, int stencil) {
+
+ /* By default, GLSurfaceView() creates a RGB_565 opaque surface.
+ * If we want a translucent one, we should change the surface's
+ * format here, using PixelFormat.TRANSLUCENT for GL Surfaces
+ * is interpreted as any 32-bit surface with alpha by SurfaceFlinger.
+ */
+ if (translucent) {
+ this.getHolder().setFormat(PixelFormat.TRANSLUCENT);
+ }
+
+ /* Setup the context factory for 2.0 rendering.
+ * See ContextFactory class definition below
+ */
+ setEGLContextFactory(new ContextFactory());
+
+ /* We need to choose an EGLConfig that matches the format of
+ * our surface exactly. This is going to be done in our
+ * custom config chooser. See ConfigChooser class definition
+ * below.
+ */
+ setEGLConfigChooser( translucent ?
+ new ConfigChooser(8, 8, 8, 8, depth, stencil) :
+ new ConfigChooser(5, 6, 5, 0, depth, stencil) );
+
+ /* Set the renderer responsible for frame rendering */
+ setRenderer(new Renderer());
+ }
+
+ private static class ContextFactory implements GLSurfaceView.EGLContextFactory {
+ private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+ public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
+ Log.w(TAG, "creating OpenGL ES 2.0 context");
+ checkEglError("Before eglCreateContext", egl);
+ int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
+ EGLContext context = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
+ checkEglError("After eglCreateContext", egl);
+ return context;
+ }
+
+ public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
+ egl.eglDestroyContext(display, context);
+ }
+ }
+
+ private static void checkEglError(String prompt, EGL10 egl) {
+ int error;
+ while ((error = egl.eglGetError()) != EGL10.EGL_SUCCESS) {
+ Log.e(TAG, String.format("%s: EGL error: 0x%x", prompt, error));
+ }
+ }
+
+
+ private static class Renderer implements GLSurfaceView.Renderer {
+ public void onDrawFrame(GL10 gl) {
+ Dreamcast.run();
+ }
+
+ public void onSurfaceChanged(GL10 gl, int width, int height) {
+ Dreamcast.init();
+ Dreamcast.setViewSize(width,height);
+ }
+
+ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+ // Do nothing.
+ }
+ }
+}
</pre></div>
<hr /><a name="file20" /><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>config.h.in</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/config.h.in
+++ lxdream/config.h.in
@@ -67,6 +67,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/* Using GLESv2 */
+#undef HAVE_GLES2
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /* Have GLX support */
#undef HAVE_GLX
</pre></div>
<hr /><a name="file21" /><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;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/configure
+++ lxdream/configure
@@ -682,6 +682,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_cpu
host_vendor
host_os
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANT
+ANDROID_SDK_HOME
+ANDROID_NDK_HOME
+ANDROID_SDK_VERSION
+ANDROID_GDBSERVER
+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;" >@@ -1455,6 +1462,9 @@
</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="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ --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
</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
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2508,6 +2518,236 @@
</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;" >+# LX_ANDROID_BUILD
+# Defines --with-android, --with-android-ndk, and --with-android-version
+# If specified, checks for a working install, and sets build parameters
+# appropriately for an Android host.
+
+
+
+
+
+# Check whether --with-android was given.
+if test "${with_android+set}" = set; then
+ withval=$with_android;
+fi
+
+
+# Check whether --with-android-ndk was given.
+if test "${with_android_ndk+set}" = set; then
+ withval=$with_android_ndk;
+fi
+
+
+# Check whether --with-android-version was given.
+if test "${with_android_version+set}" = set; then
+ withval=$with_android_version;
+else
+ with_android_version="android-8"
+fi
+
+
+ if test "x$with_android" != "x"; then
+ if test "$with_android" = "yes"; then
+ { { echo "$as_me:$LINENO: error: --with-android option must be given with the path to the Android SDK " >&5
+echo "$as_me: error: --with-android option must be given with the path to the Android SDK " >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test "x$with_android_ndk" = "x" -o "x$with_android_ndk" = "xyes"; then
+ { { echo "$as_me:$LINENO: error: --with-android-ndk=/path/to/ndk option must be used with --with-android " >&5
+echo "$as_me: error: --with-android-ndk=/path/to/ndk option must be used with --with-android " >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ ANDROID_SDK_HOME="$with_android"
+ ANDROID_NDK_HOME="$with_android_ndk"
+ ANDROID_SDK_VERSION="$with_android_version"
+
+ as_ac_File=`echo "ac_cv_file_$ANDROID_SDK_HOME/tools/ant/pre_setup.xml" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ANDROID_SDK_HOME/tools/ant/pre_setup.xml" >&5
+echo $ECHO_N "checking for $ANDROID_SDK_HOME/tools/ant/pre_setup.xml... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$ANDROID_SDK_HOME/tools/ant/pre_setup.xml"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: Android SDK not found in $ANDROID_SDK_HOME" >&5
+echo "$as_me: error: Android SDK not found in $ANDROID_SDK_HOME" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ as_ac_File=`echo "ac_cv_file_$ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties" >&5
+echo $ECHO_N "checking for $ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: Android platform version $ANDROID_SDK_VERSION not found in $ANDROID_SDK_HOME" >&5
+echo "$as_me: error: Android platform version $ANDROID_SDK_VERSION not found in $ANDROID_SDK_HOME" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ as_ac_File=`echo "ac_cv_file_$ANDROID_NDK_HOME/toolchains" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ANDROID_NDK_HOME/toolchains" >&5
+echo $ECHO_N "checking for $ANDROID_NDK_HOME/toolchains... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$ANDROID_NDK_HOME/toolchains"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: Android NDK not found in $ANDROID_NDK_HOME" >&5
+echo "$as_me: error: Android NDK not found in $ANDROID_NDK_HOME" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+ case $host_alias in
+ arm-* | "")
+ host_alias="arm-linux-androideabi"
+ host_cpu="arm"
+ host_vendor="unknown";
+ host_os="linux-androideabi"
+ ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
+ ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
+ ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-arm"
+ TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
+ TARGETFLAGS="$TARGETFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -Os"
+ ;;
+ i686-*)
+ host_alias="i686-android-linux"
+ host_cpu="i686"
+ host_vendor="android"
+ host_os="linux"
+ ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
+ ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
+ ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-x86"
+ TARGETFLAGS=""
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: Unsupported android host $host_alias" >&5
+echo "$as_me: error: Unsupported android host $host_alias" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ # Extract the first word of "ant ", so it can be a program name with args.
+set dummy ant ; 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_path_ANT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ANT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_ANT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ANT=$ac_cv_path_ANT
+if test -n "$ANT"; then
+ { echo "$as_me:$LINENO: result: $ANT" >&5
+echo "${ECHO_T}$ANT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+ CC="$ANDROID_NDK_BIN/${host_alias}-gcc"
+ CXX="$ANDROID_NDK_BIN/${host_alias}-g++"
+ CPP="$ANDROID_NDK_BIN/${host_alias}-cpp"
+ LD="$ANDROID_NDK_BIN/${host_alias}-ld"
+ AR="$ANDROID_NDK_BIN/${host_alias}-ar"
+ RANLIB="$ANDROID_NDK_BIN/${host_alias}-ranlib"
+ STRIP="$ANDROID_NDK_BIN/${host_alias}-strip"
+ OBJDUMP="$ANDROID_NDK_BIN/${host_alias}-objdump"
+ CPPFLAGS="-fPIC --sysroot=$ANDROID_SYSROOT -I$ANDROID_SYSROOT/usr/include $TARGETFLAGS $CPPFLAGS"
+ LDFLAGS="-nostdlib -Wl,--no-undefined -L${ANDROID_SYSROOT}/usr/lib -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib -Wl,-allow-shlib-undefined -Wl,-z,noexecstack $LDFLAGS"
+ LIBS="$LIBS -liconv -llog -lgcc -lc"
+
+
+
+
+
+
+ ANDROID_BUILD=yes
+ cross_compiling=yes
+ fi
+
+
+
+if test "$ANDROID_BUILD" = "yes"; then
+ GUI_ANDROID_TRUE=
+ GUI_ANDROID_FALSE='#'
+else
+ GUI_ANDROID_TRUE='#'
+ GUI_ANDROID_FALSE=
+fi
+
+
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
DEPDIR="${am__leading_dot}deps"
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -8727,6 +8967,17 @@
</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;" >+if test "$ANDROID_BUILD" = "yes"; then
+ with_gtk=no;
+ EXTRA_OUTPUT_FILES="src/android/build.properties"
+ LIBS="-lGLESv2 $LIBS"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GLES2 1
+_ACEOF
+
+ with_sdl=no
+else
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
ac_ext=m
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -9358,6 +9609,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ac_compiler_gnu=$ac_cv_c_compiler_gnu
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -9840,7 +10092,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-if test "x$have_dlopen" = "xyes"; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "x$have_dlopen" = "xyes" -a "x$ANDROID_BUILD" != "xyes"; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
cat >>confdefs.h <<\_ACEOF
#define BUILD_PLUGINS 1
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -9849,7 +10101,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-if test "x$have_dlopen" = "xyes"; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "x$have_dlopen" = "xyes" -a "x$ANDROID_BUILD" != "xyes"; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > BUILD_PLUGINS_TRUE=
BUILD_PLUGINS_FALSE='#'
else
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -11420,7 +11672,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > else
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if test "x$APPLE_BUILD" != 'xyes'; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if test "x$APPLE_BUILD" != 'xyes' -a "x$ANDROID_BUILD" != 'xyes'; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
pkg_failed=no
{ echo "$as_me:$LINENO: checking for LIBGL" >&5
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -12562,8 +12814,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-
-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if test "x$enable_translator" != "xno"; then
case $host_cpu in
i386|i486|i586|i686|x86_64)
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -13135,7 +13385,8 @@
</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;" >-if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "$ANDROID_BUILD" != "yes"; then
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -13319,7 +13570,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-if test "${ac_cv_header_IOKit_IOKitLib_h+set}" = set; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" > </span>if test "${ac_cv_header_IOKit_IOKitLib_h+set}" = set; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > { echo "$as_me:$LINENO: checking for IOKit/IOKitLib.h" >&5
echo $ECHO_N "checking for IOKit/IOKitLib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_IOKit_IOKitLib_h+set}" = set; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -13446,13 +13697,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
if test $ac_cv_header_IOKit_IOKitLib_h = yes; then
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- CDROM_DRIVER=osx
- LIBS="$LIBS -framework IOKit"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ CDROM_DRIVER=osx
+ LIBS="$LIBS -framework IOKit"
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > else
true
fi
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
if test "x$CDROM_DRIVER" = "xlinux"; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -15704,6 +15956,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test -z "${GUI_ANDROID_TRUE}" && test -z "${GUI_ANDROID_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"GUI_ANDROID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"GUI_ANDROID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16486,6 +16745,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANT!$ANT$ac_delim
+ANDROID_SDK_HOME!$ANDROID_SDK_HOME$ac_delim
+ANDROID_NDK_HOME!$ANDROID_NDK_HOME$ac_delim
+ANDROID_SDK_VERSION!$ANDROID_SDK_VERSION$ac_delim
+ANDROID_GDBSERVER!$ANDROID_GDBSERVER$ac_delim
+GUI_ANDROID_TRUE!$GUI_ANDROID_TRUE$ac_delim
+GUI_ANDROID_FALSE!$GUI_ANDROID_FALSE$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16507,13 +16773,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > CFLAGS!$CFLAGS$ac_delim
CPPFLAGS!$CPPFLAGS$ac_delim
CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
-CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
-am__fastdepCC_FOR_BUILD_TRUE!$am__fastdepCC_FOR_BUILD_TRUE$ac_delim
-am__fastdepCC_FOR_BUILD_FALSE!$am__fastdepCC_FOR_BUILD_FALSE$ac_delim
-CPP!$CPP$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-CPP_FOR_BUILD!$CPP_FOR_BUILD$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16555,6 +16814,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
+CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
+am__fastdepCC_FOR_BUILD_TRUE!$am__fastdepCC_FOR_BUILD_TRUE$ac_delim
+am__fastdepCC_FOR_BUILD_FALSE!$am__fastdepCC_FOR_BUILD_FALSE$ac_delim
+CPP!$CPP$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+CPP_FOR_BUILD!$CPP_FOR_BUILD$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > BUILD_EXEEXT!$BUILD_EXEEXT$ac_delim
BUILD_OBJEXT!$BUILD_OBJEXT$ac_delim
CFLAGS_FOR_BUILD!$CFLAGS_FOR_BUILD$ac_delim
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16645,13 +16911,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-CATALOGS!$CATALOGS$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16693,6 +16952,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > DATADIRNAME!$DATADIRNAME$ac_delim
GMOFILES!$GMOFILES$ac_delim
INSTOBJEXT!$INSTOBJEXT$ac_delim
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16706,7 +16972,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >1</span>; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >8</span>; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
</pre></div>
<hr /><a name="file22" /><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;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/configure.in
+++ lxdream/configure.in
@@ -9,6 +9,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_CANONICAL_HOST
m4_include([m4/ccforbuild.m4])
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+m4_include([m4/android.m4])
+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;" >@@ -81,6 +83,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > dnl ------------ Check if we're building on Darwin --------------
dnl For starters, do we have a working objective-c compiler?
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "$ANDROID_BUILD" = "yes"; then
+ with_gtk=no;
+ EXTRA_OUTPUT_FILES="src/android/build.properties"
+ LIBS="-lGLESv2 $LIBS"
+ AC_DEFINE(HAVE_GLES2, 1, [Using GLESv2])
+ with_sdl=no
+else
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_HAVE_OBJC([
AC_CHECK_HEADER([Cocoa/Cocoa.h], [
HAVE_COCOA='yes'
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -102,6 +111,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_CHECK_OBJCFLAG([-msse2])
AC_CHECK_OBJCFLAG([-mfpmath=sse])
])
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"])
if test "x$HAVE_COCOA" = 'xyes' -a "x$with_gtk" = "xno"; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -185,10 +195,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_SUBST(PLUGINLDFLAGS)
AC_SUBST(LXDREAMLDFLAGS)
fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-if test "x$have_dlopen" = "xyes"; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "x$have_dlopen" = "xyes" -a "x$ANDROID_BUILD" != "xyes"; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_DEFINE(BUILD_PLUGINS, [1], [Enable dynamic plugin support])
fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-AM_CONDITIONAL(BUILD_PLUGINS, [test "x$have_dlopen" = "xyes"])
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+AM_CONDITIONAL(BUILD_PLUGINS, [test "x$have_dlopen" = "xyes"<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" > -a "x$ANDROID_BUILD" != "xyes"</span>])
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
AC_CHECK_FASTCALL([
AC_DEFINE(HAVE_FASTCALL, [1], [Use fast register-passing calling conventions])
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -247,7 +257,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > PKG_CHECK_MODULES(LIBISOFS, [libisofs-1] )
dnl AC_CHECK_HEADER([libisofs/libisofs.h], [
dnl AC_CHECK_LIB(isofs, [iso_data_source_new_from_file], [
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- dnl LIBS="$LIBS -lisofs"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ dnl LIBS="-lisofs $LIBS"
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > dnl ], [ AC_MSG_FAILURE( ["Libisofs library not found, but is required"]) ])],
dnl [ AC_MSG_FAILURE( ["Libisofs headers not found, but is required"]) ])
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -263,9 +273,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > VIDEO_DRIVERS="$VIDEO_DRIVERS osmesa"
AC_DEFINE([HAVE_OSMESA],1,[Building with the OSMesa video driver]) ], [
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-dnl Otherwise we want a real GL library (unless we're on darwin, in which case it's already
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+dnl Otherwise we want a real GL library (unless we're on darwin<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" > or android</span>, in which case it's already
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > dnl taken care of above).
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if test "x$APPLE_BUILD" != 'xyes'; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if test "x$APPLE_BUILD" != 'xyes' -a "x$ANDROID_BUILD" != 'xyes'; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > 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."])])
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -310,8 +320,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_CHECK_FUNC(glDrawBuffer, [ AC_DEFINE([HAVE_OPENGL_DRAW_BUFFER],1,[Have glDrawBuffer function])], [])
AC_CHECK_FUNC(glTexEnvi, [ AC_DEFINE([HAVE_OPENGL_FIXEDFUNC],1,[Have OpenGL fixed-functionality]) ], [])dnl glTexEnvi is a pretty fair proxy for this.
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-
-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > dnl ------------------- SH4 translator target -------------------
if test "x$enable_translator" != "xno"; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -383,7 +391,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
dnl Check for native cdrom support. There can be only one.
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-AC_CHECK_HEADER([linux/cdrom.h], [
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if test "$ANDROID_BUILD" != "yes"; then
+ AC_CHECK_HEADER([linux/cdrom.h], [
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > CDROM_DRIVER=linux
dnl Some kernel versions have non-c99 compliant headers - check here
AC_MSG_CHECKING([C99 compliant kernel headers])
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -393,10 +402,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_MSG_RESULT([No])
STDCFLAG="-std=gnu99"])
CFLAGS="$old_CFLAGS"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-], [true])
-AC_CHECK_HEADER([IOKit/IOKitLib.h], [
- CDROM_DRIVER=osx
- LIBS="$LIBS -framework IOKit"],[true])
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ ], [true])
+ AC_CHECK_HEADER([IOKit/IOKitLib.h], [
+ CDROM_DRIVER=osx
+ LIBS="$LIBS -framework IOKit"],[true])
+fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AM_CONDITIONAL(CDROM_LINUX, [test "x$CDROM_DRIVER" = "xlinux"])
AM_CONDITIONAL(CDROM_OSX, [test "x$CDROM_DRIVER" = "xosx"])
AM_CONDITIONAL(CDROM_NONE, [test "x$CDROM_DRIVER" = "x"])
</pre></div>
<hr /><a name="file23" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/m4</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>android.m4</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/m4/android.m4
+++ lxdream/m4/android.m4
@@ -0,0 +1,79 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+# LX_ANDROID_BUILD
+# Defines --with-android, --with-android-ndk, and --with-android-version
+# If specified, checks for a working install, and sets build parameters
+# appropriately for an Android host.
+AC_DEFUN([LX_ANDROID_BUILD], [
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_ARG_WITH( android, AS_HELP_STRING( [--with-android=SDK], [Specify the location of the Android SDK] ) )
+ AC_ARG_WITH( android-ndk, AS_HELP_STRING( [--with-android-ndk=NDK], [Specify the location of the Android NDK] ) )
+ AC_ARG_WITH( android-version, AS_HELP_STRING( [--with-android-version], [Specify target Android SDK version]), [], [with_android_version="android-8"] )
+
+ if test "x$with_android" != "x"; then
+ if test "$with_android" = "yes"; then
+ AC_MSG_ERROR( [--with-android option must be given with the path to the Android SDK] )
+ fi
+ if test "x$with_android_ndk" = "x" -o "x$with_android_ndk" = "xyes"; then
+ AC_MSG_ERROR( [--with-android-ndk=/path/to/ndk option must be used with --with-android] )
+ fi
+
+ ANDROID_SDK_HOME="$with_android"
+ ANDROID_NDK_HOME="$with_android_ndk"
+ ANDROID_SDK_VERSION="$with_android_version"
+
+ AC_CHECK_FILE( [$ANDROID_SDK_HOME/tools/ant/pre_setup.xml], [], [ AC_MSG_ERROR([Android SDK not found in $ANDROID_SDK_HOME]) ])
+ AC_CHECK_FILE( [$ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties], [], [ AC_MSG_ERROR([Android platform version $ANDROID_SDK_VERSION not found in $ANDROID_SDK_HOME]) ])
+ AC_CHECK_FILE( [$ANDROID_NDK_HOME/toolchains], [], [ AC_MSG_ERROR([Android NDK not found in $ANDROID_NDK_HOME]) ])
+
+ case $host_alias in
+ arm-* | "")
+ host_alias="arm-linux-androideabi"
+ host_cpu="arm"
+ host_vendor="unknown";
+ host_os="linux-androideabi"
+ ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
+ ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
+ ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-arm"
+ TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
+ TARGETFLAGS="$TARGETFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -Os"
+ ;;
+ i686-*)
+ host_alias="i686-android-linux"
+ host_cpu="i686"
+ host_vendor="android"
+ host_os="linux"
+ ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
+ ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
+ ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-x86"
+ TARGETFLAGS=""
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported android host $host_alias])
+ ;;
+ esac
+
+ AC_PATH_PROG( ANT, [ant] )
+
+ CC="$ANDROID_NDK_BIN/${host_alias}-gcc"
+ CXX="$ANDROID_NDK_BIN/${host_alias}-g++"
+ CPP="$ANDROID_NDK_BIN/${host_alias}-cpp"
+ LD="$ANDROID_NDK_BIN/${host_alias}-ld"
+ AR="$ANDROID_NDK_BIN/${host_alias}-ar"
+ RANLIB="$ANDROID_NDK_BIN/${host_alias}-ranlib"
+ STRIP="$ANDROID_NDK_BIN/${host_alias}-strip"
+ OBJDUMP="$ANDROID_NDK_BIN/${host_alias}-objdump"
+ CPPFLAGS="-fPIC --sysroot=$ANDROID_SYSROOT -I$ANDROID_SYSROOT/usr/include $TARGETFLAGS $CPPFLAGS"
+ LDFLAGS="-nostdlib -Wl,--no-undefined -L${ANDROID_SYSROOT}/usr/lib -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib -Wl,-allow-shlib-undefined -Wl,-z,noexecstack $LDFLAGS"
+ LIBS="$LIBS -liconv -llog -lgcc -lc"
+
+ AC_SUBST(ANDROID_SDK_HOME)
+ AC_SUBST(ANDROID_NDK_HOME)
+ AC_SUBST(ANDROID_SDK_VERSION)
+ AC_SUBST(ANDROID_GDBSERVER)
+
+ ANDROID_BUILD=yes
+ cross_compiling=yes
+ fi
+
+ AM_CONDITIONAL(GUI_ANDROID, [test "$ANDROID_BUILD" = "yes"])
+
+])
</pre></div>
<hr /><a name="file24" /><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;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/Makefile.am
+++ lxdream/src/Makefile.am
@@ -110,6 +110,15 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > drivers/video_gtk.c
endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+if GUI_ANDROID
+lxdream_SOURCES += gui_none.c
+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
+liblxdream_so_SOURCES = gui_jni.c drivers/cdrom/cd_none.c
+liblxdream_so_LIBS = liblxdream-core.a
+endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if GUI_COCOA
liblxdream_core_a_SOURCES += cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
lxdream_SOURCES += cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
</pre></div>
<hr /><a name="file25" /><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;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/Makefile.in
+++ lxdream/src/Makefile.in
@@ -58,41 +58,44 @@
</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_COCOA_TRUE@am__append_5 = cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
-@GUI_COCOA_TRUE@am__append_6 = cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@am__append_5 = gui_none.c
+@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 id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_COCOA_TRUE@ cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
@GUI_COCOA_TRUE@ cocoaui/cocoa_ctrl.m drivers/video_osx.m
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_COCOA_FALSE@am__append_7 = paths_unix.c drivers/io_glib.c
-@VIDEO_OSMESA_TRUE@am__append_8 = drivers/video_gdk.c
-@VIDEO_GLX_TRUE@am__append_9 = drivers/video_glx.c drivers/video_glx.h
-@VIDEO_NSGL_TRUE@am__append_10 = drivers/video_nsgl.m drivers/video_nsgl.h
-@AUDIO_OSX_TRUE@am__append_11 = drivers/audio_osx.m
-@BUILD_PLUGINS_TRUE@am__append_12 = lxdream_dummy.@SOEXT@
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__append_13 = audio_sdl.@SOEXT@
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__append_14 = audio_pulse.@SOEXT@
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__append_15 = audio_esd.@SOEXT@
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__append_16 = audio_alsa.@SOEXT@
-@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__append_17 = input_lirc.@SOEXT@
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_18 = drivers/audio_sdl.c
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_19 = @SDL_LIBS@
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_20 = drivers/audio_pulse.c
-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_21 = @PULSE_LIBS@
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_22 = drivers/audio_esd.c
-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_23 = @ESOUND_LIBS@
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_24 = drivers/audio_alsa.c
-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_25 = @ALSA_LIBS@
-@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_26 = drivers/input_lirc.c
-@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_27 = -llirc_client
-@CDROM_LINUX_TRUE@am__append_28 = drivers/cdrom/cd_linux.c
-@CDROM_OSX_TRUE@am__append_29 = drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
-@CDROM_NONE_TRUE@am__append_30 = drivers/cdrom/cd_none.c
-@JOY_LINUX_TRUE@am__append_31 = drivers/joy_linux.c drivers/joy_linux.h
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_COCOA_FALSE@am__append_8 = paths_unix.c drivers/io_glib.c
+@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
+@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="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
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >configure.in</span>
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >m4/android.m4 \</span>
+ $(top_srcdir)/configure.in
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -192,7 +195,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_6 = audio_alsa.@SOEXT@$(EXEEXT)
@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__EXEEXT_7 = input_lirc.@SOEXT@$(EXEEXT)
pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+PROGRAMS = $(bin_PROGRAMS) $(<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >noinst_PROGRAMS) $(</span>pkglib_PROGRAMS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am_audio_alsa_@SOEXT@_OBJECTS =
audio_alsa_@SOEXT@_OBJECTS = $(am_audio_alsa_@SOEXT@_OBJECTS)
@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@audio_alsa_@SOEXT@_DEPENDENCIES = \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -213,10 +216,17 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > input_lirc_@SOEXT@_OBJECTS = $(am_input_lirc_@SOEXT@_OBJECTS)
@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@input_lirc_@SOEXT@_DEPENDENCIES = \
@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@ input_lirc.lo
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+am__liblxdream_so_SOURCES_DIST = gui_jni.c drivers/cdrom/cd_none.c
+@GUI_ANDROID_TRUE@am_liblxdream_so_OBJECTS = gui_jni.$(OBJEXT) \
+@GUI_ANDROID_TRUE@ cd_none.$(OBJEXT)
+liblxdream_so_OBJECTS = $(am_liblxdream_so_OBJECTS)
+am__DEPENDENCIES_1 =
+@GUI_ANDROID_TRUE@liblxdream_so_DEPENDENCIES = liblxdream-core.a \
+@GUI_ANDROID_TRUE@ $(am__DEPENDENCIES_1)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am__lxdream_SOURCES_DIST = main.c plugin.c plugin.h gtkui/gtkui.c \
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 \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- gtkui/gtk_ctrl.c gtkui/gtk_gd.c drivers/video_gtk.c \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ gtkui/gtk_ctrl.c gtkui/gtk_gd.c drivers/video_gtk.c <span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >gui_none.c </span>\
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > 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 \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -233,36 +243,36 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_GTK_TRUE@ gtk_mmio.$(OBJEXT) gtk_debug.$(OBJEXT) \
@GUI_GTK_TRUE@ gtk_dump.$(OBJEXT) gtk_ctrl.$(OBJEXT) \
@GUI_GTK_TRUE@ gtk_gd.$(OBJEXT) video_gtk.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_COCOA_TRUE@am__objects_6 = cocoaui.$(OBJEXT) cocoa_cfg.$(OBJEXT) \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@am__objects_6 = gui_none.$(OBJEXT)
+@GUI_COCOA_TRUE@am__objects_7 = cocoaui.$(OBJEXT) cocoa_cfg.$(OBJEXT) \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_COCOA_TRUE@ cocoa_win.$(OBJEXT) cocoa_gd.$(OBJEXT) \
@GUI_COCOA_TRUE@ cocoa_prefs.$(OBJEXT) cocoa_ctrl.$(OBJEXT) \
@GUI_COCOA_TRUE@ video_osx.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@VIDEO_OSMESA_TRUE@am__objects_7 = video_gdk.$(OBJEXT)
-@VIDEO_GLX_TRUE@am__objects_8 = video_glx.$(OBJEXT)
-@VIDEO_NSGL_TRUE@am__objects_9 = video_nsgl.$(OBJEXT)
-@AUDIO_OSX_TRUE@am__objects_10 = audio_osx.$(OBJEXT)
-@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__objects_11 = \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@VIDEO_OSMESA_TRUE@am__objects_8 = video_gdk.$(OBJEXT)
+@VIDEO_GLX_TRUE@am__objects_9 = video_glx.$(OBJEXT)
+@VIDEO_NSGL_TRUE@am__objects_10 = video_nsgl.$(OBJEXT)
+@AUDIO_OSX_TRUE@am__objects_11 = audio_osx.$(OBJEXT)
+@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__objects_12 = \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@ audio_sdl.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__objects_1<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >2</span> = \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__objects_1<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >3</span> = \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@ audio_pulse.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__objects_1<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >3</span> = \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__objects_1<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >4</span> = \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@ audio_esd.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__objects_1<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >4</span> = \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__objects_1<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >5</span> = \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@ audio_alsa.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__objects_1<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >5</span> = \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__objects_1<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >6</span> = \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@ input_lirc.$(OBJEXT)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@CDROM_LINUX_TRUE@am__objects_16 = cd_linux.$(OBJEXT)
-@CDROM_OSX_TRUE@am__objects_17 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
-@CDROM_NONE_TRUE@am__objects_18 = cd_none.$(OBJEXT)
-@JOY_LINUX_TRUE@am__objects_19 = joy_linux.$(OBJEXT)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@CDROM_LINUX_TRUE@am__objects_17 = cd_linux.$(OBJEXT)
+@CDROM_OSX_TRUE@am__objects_18 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
+@CDROM_NONE_TRUE@am__objects_19 = cd_none.$(OBJEXT)
+@JOY_LINUX_TRUE@am__objects_20 = joy_linux.$(OBJEXT)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am_lxdream_OBJECTS = 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) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(am__objects_18) $(am__objects_19)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(am__objects_18) $(am__objects_19)<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" > $(am__objects_20)</span>
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_OBJECTS = $(am_lxdream_OBJECTS)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-am__DEPENDENCIES_1 =
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_DEPENDENCIES = liblxdream-core.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -305,13 +315,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > SOURCES = $(liblxdream_core_a_SOURCES) $(audio_alsa_@SOEXT@_SOURCES) \
$(audio_esd_@SOEXT@_SOURCES) $(audio_pulse_@SOEXT@_SOURCES) \
$(audio_sdl_@SOEXT@_SOURCES) $(input_lirc_@SOEXT@_SOURCES) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(lxdream_SOURCES) $(lxdream_dummy_@SOEXT@_SOURCES) \
- $(test_testlxpaths_SOURCES) $(test_testsh4x86_SOURCES) \
- $(test_testxlt_SOURCES)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(liblxdream_so_SOURCES) $(lxdream_SOURCES) \
+ $(lxdream_dummy_@SOEXT@_SOURCES) $(test_testlxpaths_SOURCES) \
+ $(test_testsh4x86_SOURCES) $(test_testxlt_SOURCES)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > DIST_SOURCES = $(am__liblxdream_core_a_SOURCES_DIST) \
$(audio_alsa_@SOEXT@_SOURCES) $(audio_esd_@SOEXT@_SOURCES) \
$(audio_pulse_@SOEXT@_SOURCES) $(audio_sdl_@SOEXT@_SOURCES) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(input_lirc_@SOEXT@_SOURCES) $(am__lxdream_SOURCES_DIST) \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(input_lirc_@SOEXT@_SOURCES) \
+ $(am__liblxdream_so_SOURCES_DIST) $(am__lxdream_SOURCES_DIST) \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > $(lxdream_dummy_@SOEXT@_SOURCES) $(test_testlxpaths_SOURCES) \
$(am__test_testsh4x86_SOURCES_DIST) $(test_testxlt_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -330,6 +341,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
+ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
+ANDROID_SDK_HOME = @ANDROID_SDK_HOME@
+ANDROID_SDK_VERSION = @ANDROID_SDK_VERSION@
+ANT = @ANT@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ARMCC = @ARMCC@
ARMLD = @ARMLD@
ARMOBJCOPY = @ARMOBJCOPY@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -398,6 +414,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+GUI_ANDROID_FALSE = @GUI_ANDROID_FALSE@
+GUI_ANDROID_TRUE = @GUI_ANDROID_TRUE@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GUI_COCOA_FALSE = @GUI_COCOA_FALSE@
GUI_COCOA_TRUE = @GUI_COCOA_TRUE@
GUI_GTK_FALSE = @GUI_GTK_FALSE@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -547,15 +565,15 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AM_CPPFLAGS = @LXDREAMCPPFLAGS@
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_19) \
- $(am__append_21) $(am__append_23) $(am__append_25) \
- $(am__append_27)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ $(am__append_20) \
+ $(am__append_22) $(am__append_24) $(am__append_26) \
+ $(am__append_28)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_SOURCES = main.c $(am__append_1) $(am__append_4) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(am__append_6) $(am__append_8) $(am__append_9) \
- $(am__append_10) $(am__append_11) $(am__append_18) \
- $(am__append_20) $(am__append_22) $(am__append_24) \
- $(am__append_26) $(am__append_28) $(am__append_29) \
- $(am__append_30) $(am__append_31)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(am__append_5) $(am__append_7) $(am__append_9) \
+ $(am__append_10) $(am__append_11) $(am__append_12) \
+ $(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="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream_LIBS = liblxdream-core.a
noinst_LIBRARIES = liblxdream-core.a
liblxdream_core_a_SOURCES = version.c config.c config.h lxdream.h \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -595,8 +613,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > drivers/cdrom/cd_mmc.c drivers/cdrom/isofs.h \
drivers/cdrom/isofs.c drivers/cdrom/isomem.c sh4/sh4.def \
sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- hotkeys.c hotkeys.h $(am__append_2) $(am__append_5) \
- $(am__append_7)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ hotkeys.c hotkeys.h $(am__append_2) $(am__append_6) \
+ $(am__append_8)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
@BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
@BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -604,6 +622,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4x86.c xlat/xltcache.c sh4/sh4dasm.c \
@BUILD_SH4X86_TRUE@ xlat/xltcache.h mem.c util.c cpu.c
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@liblxdream_so_LINK = $(LINK) -Wl,-soname,liblxdream.so -shared
+@GUI_ANDROID_TRUE@liblxdream_so_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ -lm
+@GUI_ANDROID_TRUE@liblxdream_so_SOURCES = gui_jni.c drivers/cdrom/cd_none.c
+@GUI_ANDROID_TRUE@liblxdream_so_LIBS = liblxdream-core.a
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @BUILD_PLUGINS_TRUE@lxdream_dummy_@SOEXT@_SOURCES =
@BUILD_PLUGINS_TRUE@lxdream_dummy_@SOEXT@_LDADD = lxdream_dummy.lo @SDL_LIBS@
@BUILD_PLUGINS_TRUE@lxdream_dummy_@SOEXT@_LDFLAGS = $(PLUGINLDFLAGS)
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -695,6 +717,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
clean-checkPROGRAMS:
-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -733,6 +758,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > input_lirc.@SOEXT@$(EXEEXT): $(input_lirc_@SOEXT@_OBJECTS) $(input_lirc_@SOEXT@_DEPENDENCIES)
@rm -f input_lirc.@SOEXT@$(EXEEXT)
$(LINK) $(input_lirc_@SOEXT@_LDFLAGS) $(input_lirc_@SOEXT@_OBJECTS) $(input_lirc_@SOEXT@_LDADD) $(LIBS)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+liblxdream.so$(EXEEXT): $(liblxdream_so_OBJECTS) $(liblxdream_so_DEPENDENCIES)
+ @rm -f liblxdream.so$(EXEEXT)
+ $(liblxdream_so_LINK) $(liblxdream_so_LDFLAGS) $(liblxdream_so_OBJECTS) $(liblxdream_so_LDADD) $(LIBS)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > lxdream$(EXEEXT): $(lxdream_OBJECTS) $(lxdream_DEPENDENCIES)
@rm -f lxdream$(EXEEXT)
$(lxdream_LINK) $(lxdream_LDFLAGS) $(lxdream_OBJECTS) $(lxdream_LDADD) $(LIBS)
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -816,6 +844,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_win.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkui.Po@am__quote@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_jni.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_none.Po@am__quote@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hotkeys.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386-dis.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ide.Po@am__quote@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -1808,6 +1838,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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io_glib.obj `if test -f 'drivers/io_glib.c'; then $(CYGPATH_W) 'drivers/io_glib.c'; else $(CYGPATH_W) '$(srcdir)/drivers/io_glib.c'; fi`
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+cd_none.o: drivers/cdrom/cd_none.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cd_none.o -MD -MP -MF "$(DEPDIR)/cd_none.Tpo" -c -o cd_none.o `test -f 'drivers/cdrom/cd_none.c' || echo '$(srcdir)/'`drivers/cdrom/cd_none.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cd_none.Tpo" "$(DEPDIR)/cd_none.Po"; else rm -f "$(DEPDIR)/cd_none.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/cdrom/cd_none.c' object='cd_none.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_none.o `test -f 'drivers/cdrom/cd_none.c' || echo '$(srcdir)/'`drivers/cdrom/cd_none.c
+
+cd_none.obj: drivers/cdrom/cd_none.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cd_none.obj -MD -MP -MF "$(DEPDIR)/cd_none.Tpo" -c -o cd_none.obj `if test -f 'drivers/cdrom/cd_none.c'; then $(CYGPATH_W) 'drivers/cdrom/cd_none.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cdrom/cd_none.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cd_none.Tpo" "$(DEPDIR)/cd_none.Po"; else rm -f "$(DEPDIR)/cd_none.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/cdrom/cd_none.c' object='cd_none.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_none.obj `if test -f 'drivers/cdrom/cd_none.c'; then $(CYGPATH_W) 'drivers/cdrom/cd_none.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cdrom/cd_none.c'; fi`
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > gtkui.o: gtkui/gtkui.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gtkui.o -MD -MP -MF "$(DEPDIR)/gtkui.Tpo" -c -o gtkui.o `test -f 'gtkui/gtkui.c' || echo '$(srcdir)/'`gtkui/gtkui.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gtkui.Tpo" "$(DEPDIR)/gtkui.Po"; else rm -f "$(DEPDIR)/gtkui.Tpo"; exit 1; fi
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2074,20 +2118,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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_osx.obj `if test -f 'drivers/cdrom/cd_osx.c'; then $(CYGPATH_W) 'drivers/cdrom/cd_osx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cdrom/cd_osx.c'; fi`
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-cd_none.o: drivers/cdrom/cd_none.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cd_none.o -MD -MP -MF "$(DEPDIR)/cd_none.Tpo" -c -o cd_none.o `test -f 'drivers/cdrom/cd_none.c' || echo '$(srcdir)/'`drivers/cdrom/cd_none.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cd_none.Tpo" "$(DEPDIR)/cd_none.Po"; else rm -f "$(DEPDIR)/cd_none.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/cdrom/cd_none.c' object='cd_none.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_none.o `test -f 'drivers/cdrom/cd_none.c' || echo '$(srcdir)/'`drivers/cdrom/cd_none.c
-
-cd_none.obj: drivers/cdrom/cd_none.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cd_none.obj -MD -MP -MF "$(DEPDIR)/cd_none.Tpo" -c -o cd_none.obj `if test -f 'drivers/cdrom/cd_none.c'; then $(CYGPATH_W) 'drivers/cdrom/cd_none.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cdrom/cd_none.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cd_none.Tpo" "$(DEPDIR)/cd_none.Po"; else rm -f "$(DEPDIR)/cd_none.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/cdrom/cd_none.c' object='cd_none.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_none.obj `if test -f 'drivers/cdrom/cd_none.c'; then $(CYGPATH_W) 'drivers/cdrom/cd_none.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cdrom/cd_none.c'; fi`
-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > joy_linux.o: drivers/joy_linux.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT joy_linux.o -MD -MP -MF "$(DEPDIR)/joy_linux.Tpo" -c -o joy_linux.o `test -f 'drivers/joy_linux.c' || echo '$(srcdir)/'`drivers/joy_linux.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/joy_linux.Tpo" "$(DEPDIR)/joy_linux.Po"; else rm -f "$(DEPDIR)/joy_linux.Tpo"; exit 1; fi
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2617,7 +2647,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > clean: clean-recursive
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- clean-noinstLIBRARIES clean-pkglibPROGRAMS mostlyclean-am
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ clean-noinstLIBRARIES clean-noinstPROGRAMS \
+ clean-pkglibPROGRAMS mostlyclean-am
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
distclean: distclean-recursive
-rm -rf ./$(DEPDIR)
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2669,19 +2700,19 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
check-am clean clean-binPROGRAMS clean-checkPROGRAMS \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- clean-generic clean-noinstLIBRARIES clean-pkglibPROGRAMS \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-recursive \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-pkglibPROGRAMS \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
+ clean-pkglibPROGRAMS clean-recursive ctags ctags-recursive \
+ distclean distclean-compile distclean-generic \
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man \
+ install-pkglibPROGRAMS install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > uninstall-pkglibPROGRAMS
</pre></div>
<hr /><a name="file26" /><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>display.c</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/display.c
+++ lxdream/src/display.c
@@ -74,6 +74,19 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > struct keymap_entry *keymap[0];
} *input_driver_entry_t;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
+#ifndef GL_RGBA8
+#define GL_RGBA8 GL_RGBA8_OES
+#endif
+
+#ifndef GL_RGB5
+#define GL_RGB5 GL_RGB565
+#endif
+
+#ifndef GL_BGR
+#define GL_BGR GL_BGRA
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Colour format information
*/
</pre></div>
<hr /><a name="file27" /><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>display.h</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/display.h
+++ lxdream/src/display.h
@@ -32,9 +32,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #include <OpenGL/gl.h>
#include <OpenGL/glext.h>
#else
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#if HAVE_GLES2
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#else
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #include <GL/gl.h>
#include <GL/glext.h>
#endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
#ifdef __cplusplus
extern "C" {
</pre></div>
<hr /><a name="file28" /><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_gl.c</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_gl.c
+++ lxdream/src/drivers/video_gl.c
@@ -23,6 +23,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #include "pvr2/glutil.h"
#include "drivers/video_gl.h"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" ><a name="task4" />+/* <span class="task" style="background-color:#ffff00;" >FIXME</span>: Need to actually handle this case */
+#ifndef GL_PACK_ROW_LENGTH
+#define glPixelStorei(key,val)
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > uint32_t video_width, video_height;
struct video_vertex {
float x,y;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -89,15 +94,16 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > defineOrthoMatrix(video_box.viewMatrix, video_width, video_height, 0, 65535);
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#ifdef HAVE_OPENGL_FIXEDFUNC
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Setup the gl context for writes to the display output.
*/
void gl_framebuffer_setup()
{
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ glViewport( 0, 0, video_width, video_height );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glLoadMatrixf(video_box.viewMatrix);
glBlendFunc( GL_ONE, GL_ZERO );
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glViewport( 0, 0, video_width, video_height );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glVertexPointer(2, GL_FLOAT, sizeof(struct video_vertex), &video_box.gap1[0].x);
glColorPointer(3, GL_FLOAT, sizeof(struct video_vertex), &video_box.gap1[0].r);
glTexCoordPointer(2, GL_FLOAT, sizeof(struct video_vertex), &video_box.gap1[0].u);
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -106,6 +112,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glEnableClientState( GL_TEXTURE_COORD_ARRAY );
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#else
+void gl_framebuffer_setup()
+{
<a name="task5" />+ /* <span class="task" style="background-color:#ffff00;" >TODO</span> */
+}
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > void gl_display_render_buffer( render_buffer_t buffer )
{
gl_texture_window( buffer->width, buffer->height, buffer->buf_id, buffer->inverted );
</pre></div>
<hr /><a name="file29" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/src</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>gui_jni.c</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/gui_jni.c
+++ lxdream/src/gui_jni.c
@@ -0,0 +1,103 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * $Id$
+ *
+ * JNI wrappers for operating the emulator from Java.
+ *
+ * Copyright (c) 2012 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <jni.h>
+#include <android/log.h>
+#include <libisofs.h>
+#include "dreamcast.h"
+#include "gui.h"
+#include "config.h"
+#include "display.h"
+#include "gdlist.h"
+#include "hotkeys.h"
+#include "serial.h"
+#include "aica/audio.h"
+#include "maple/maple.h"
+#include "vmu/vmulist.h"
+
+JNIEXPORT void JNICALL Java_org_lxdream_Dreamcast_init(JNIEnv * env, jobject obj, jint width, jint height)
+{
+ lxdream_make_config_dir( );
+ lxdream_load_config( );
+ iso_init();
+ gdrom_list_init();
+ vmulist_init();
+ dreamcast_init(1);
+
+ audio_init_driver(NULL);
+ display_driver_t display_driver = get_display_driver_by_name(NULL);
+ display_set_driver(display_driver);
+
+ hotkeys_init();
+ serial_init();
+ maple_reattach_all();
+ INFO( "%s! ready...", APP_NAME );
+}
+
+JNIEXPORT void JNICALL Java_org_lxdream_Dreamcast_setViewSize(JNIEnv * env, jobject obj, jint width, jint height)
+{
+
+}
+
+JNIEXPORT void JNICALL Java_org_lxdream_Dreamcast_run(JNIEnv * env, jobject obj)
+{
+ dreamcast_run();
+}
+
+JNIEXPORT void JNICALL Java_org_lxdream_Dreamcast_stop(JNIEnv * env, jobject obj)
+{
+ dreamcast_stop();
+}
+
+gboolean gui_parse_cmdline( int *argc, char **argv[] )
+{
+ return TRUE;
+}
+
+gboolean gui_init( gboolean debug, gboolean fullscreen )
+{
+ return TRUE;
+}
+
+void gui_main_loop( gboolean run ) {
+ if( run ) {
+ dreamcast_run();
+ }
+}
+
+gboolean gui_error_dialog( const char *fmt, ... )
+{
+ return TRUE;
+}
+
+void gui_update_state()
+{
+}
+
+void gui_set_use_grab( gboolean grab )
+{
+}
+
+void gui_update_io_activity( io_activity_type activity, gboolean active )
+{
+}
+
+void gui_do_later( do_later_callback_t func )
+{
+ func();
+}
</pre></div>
<hr /><a name="file30" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span id="added" class="pathname" style="font-family:monospace; float:right; background-color:#ddffdd;" >lxdream/src</span><br />
<div id="added" class="fileheader" style="margin-bottom:.5em; background-color:#ddffdd;" ><big><b>gui_none.c</b></big> <small id="info" style="color: #888888;" >added at be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/gui_none.c
+++ lxdream/src/gui_none.c
@@ -0,0 +1,58 @@
</small></pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * $Id$
+ *
+ * Dummy GUI implementation for headless systems.
+ *
+ * Copyright (c) 2012 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include "gui.h"
+
+gboolean gui_parse_cmdline( int *argc, char **argv[] )
+{
+ return TRUE;
+}
+
+gboolean gui_init( gboolean debug, gboolean fullscreen )
+{
+ return TRUE;
+}
+
+void gui_main_loop( gboolean run ) {
+ if( run ) {
+ dreamcast_run();
+ }
+}
+
+gboolean gui_error_dialog( const char *fmt, ... )
+{
+ return TRUE;
+}
+
+void gui_update_state()
+{
+}
+
+void gui_set_use_grab( gboolean grab )
+{
+}
+
+void gui_update_io_activity( io_activity_type activity, gboolean active )
+{
+}
+
+void gui_do_later( do_later_callback_t func )
+{
+ func();
+}
+
</pre></div>
<hr /><a name="file31" /><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;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/tools/Makefile.in
+++ lxdream/src/tools/Makefile.in
@@ -41,7 +41,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >configure.in</span>
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >m4/android.m4 \</span>
+ $(top_srcdir)/configure.in
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -77,6 +78,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
+ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
+ANDROID_SDK_HOME = @ANDROID_SDK_HOME@
+ANDROID_SDK_VERSION = @ANDROID_SDK_VERSION@
+ANT = @ANT@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ARMCC = @ARMCC@
ARMLD = @ARMLD@
ARMOBJCOPY = @ARMOBJCOPY@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -145,6 +151,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+GUI_ANDROID_FALSE = @GUI_ANDROID_FALSE@
+GUI_ANDROID_TRUE = @GUI_ANDROID_TRUE@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GUI_COCOA_FALSE = @GUI_COCOA_FALSE@
GUI_COCOA_TRUE = @GUI_COCOA_TRUE@
GUI_GTK_FALSE = @GUI_GTK_FALSE@
</pre></div>
<hr /><a name="file32" /><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>util.c</b></big> <small id="info" style="color: #888888;" >91bcb2dec4ef -> be3121267597</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/util.c
+++ lxdream/src/util.c
@@ -23,6 +23,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#include <unistd.h>
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #include <signal.h>
#include <time.h>
#include <zlib.h>
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -34,6 +35,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #include "gui.h"
#include "sh4/sh4.h"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#ifdef __ANDROID__
+#include <android/log.h>
+static int android_log_levels[] = {ANDROID_LOG_FATAL, ANDROID_LOG_ERROR, ANDROID_LOG_WARN, ANDROID_LOG_INFO, ANDROID_LOG_DEBUG, ANDROID_LOG_VERBOSE};
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > char *msg_levels[] = { "FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE" };
int global_msg_level = EMIT_WARN;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -344,8 +350,11 @@
</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;" >-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > strftime( buf, sizeof(buf), "%H:%M:%S", localtime(&tm) );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#ifdef __ANDROID__
+ __android_log_print(android_log_levels[level], "lxdream", "%s %08X %s\n", buf, sh4r.pc, text );
+#else
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fprintf( stderr, "%s %08X %-5s %s\n", buf, sh4r.pc, msg_levels[level], text );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > g_free(text);
}
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>