<html>
<body>
<div id="body" style="background-color:#ffffff;" >
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head" style="border-bottom-width:1px;border-bottom-style:solid;" ><td class="headtd" style="padding:0;padding-top:.2em;" colspan="4">Commit in <b><tt>lxdream</tt></b></td></tr>
<tr><td><tt><a href="#file1">Makefile.am</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+10</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-4</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">0ea1904e2b14 -> a81130f57df6</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">Makefile.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+9</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-4</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">0ea1904e2b14 -> a81130f57df6</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+19</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-8</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >2 modified files</small><br />
<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;" >
Fully clean the android part before building it - dependencies don't seem to
work properly.
Add install-adb rule for convenience
</pre>
<hr /><a name="file1" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.am</b></big> <small id="info" style="color: #888888;" >0ea1904e2b14 -> a81130f57df6</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.am
+++ lxdream/Makefile.am
@@ -100,18 +100,24 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > bundle: all
if GUI_ANDROID
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-apk: src/liblxdream.so
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+all-local:
+ (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
+ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
+ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
+ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
+ -Dtarget=$(ANDROID_SDK_VERSION) clean )
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > $(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) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- -Dout.dir="$$TARGETDIR" \
- -Dnative.libs.dir="$$TARGETDIR/libs" \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
-Dtarget=$(ANDROID_SDK_VERSION) debug )
cp android/Lxdream-debug.apk Lxdream-debug.apk
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-all-local: apk
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+install-adb:
+ $(ANDROID_SDK_HOME)/platform-tools/adb install -r Lxdream-debug.apk
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > endif
</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.in</b></big> <small id="info" style="color: #888888;" >0ea1904e2b14 -> a81130f57df6</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.in
+++ lxdream/Makefile.in
@@ -890,20 +890,25 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
bundle: all
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_ANDROID_TRUE@apk: src/liblxdream.so
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@all-local:
+@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" -Dnative.libs.dir="$$TARGETDIR/libs" \
+@GUI_ANDROID_TRUE@ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
+@GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) clean )
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @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) \
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" \
-@GUI_ANDROID_TRUE@ -Dnative.libs.dir="$$TARGETDIR/libs" \
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_ANDROID_TRUE@ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
@GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) debug )
@GUI_ANDROID_TRUE@ cp android/Lxdream-debug.apk Lxdream-debug.apk
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_ANDROID_TRUE@all-local: apk
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@install-adb:
+@GUI_ANDROID_TRUE@ $(ANDROID_SDK_HOME)/platform-tools/adb install -r 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>
<center><small>Chaos Theory</small></center>
</div></body></html>