Search
lxdream.org :: lxdream/Makefile.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename Makefile.in
changeset 1245:01e0020adf88
prev1239:be3121267597
next1249:a81130f57df6
author nkeynes
date Fri Mar 02 23:49:10 2012 +1000 (7 years ago)
permissions -rw-r--r--
last change Android WIP:
* Rename gui_jni.c to gui_android.c - now quite android specific.
* Implement generic EGL driver with very minimal Java wrapper
* Run emulation in separate thread, and implement simple queue for
inter-thread communication.
* Add menu/action-bar items for start + reset
file annotate diff log raw
1.1 --- a/Makefile.in Sat Feb 25 21:30:49 2012 +1000
1.2 +++ b/Makefile.in Fri Mar 02 23:49:10 2012 +1000
1.3 @@ -96,6 +96,7 @@
1.4 AMTAR = @AMTAR@
1.5 ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
1.6 ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
1.7 +ANDROID_NDK_VERSION = @ANDROID_NDK_VERSION@
1.8 ANDROID_SDK_HOME = @ANDROID_SDK_HOME@
1.9 ANDROID_SDK_VERSION = @ANDROID_SDK_VERSION@
1.10 ANT = @ANT@
1.11 @@ -889,7 +890,7 @@
1.12
1.13 bundle: all
1.14
1.15 -@GUI_ANDROID_TRUE@Lxdream-debug.apk: src/liblxdream.so
1.16 +@GUI_ANDROID_TRUE@apk: src/liblxdream.so
1.17 @GUI_ANDROID_TRUE@ $(mkdir_p) android/libs/armeabi
1.18 @GUI_ANDROID_TRUE@ $(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
1.19 @GUI_ANDROID_TRUE@ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
1.20 @@ -898,10 +899,11 @@
1.21 @GUI_ANDROID_TRUE@ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
1.22 @GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" \
1.23 @GUI_ANDROID_TRUE@ -Dnative.libs.dir="$$TARGETDIR/libs" \
1.24 +@GUI_ANDROID_TRUE@ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
1.25 @GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) debug )
1.26 @GUI_ANDROID_TRUE@ cp android/Lxdream-debug.apk Lxdream-debug.apk
1.27
1.28 -@GUI_ANDROID_TRUE@all-local: Lxdream-debug.apk
1.29 +@GUI_ANDROID_TRUE@all-local: apk
1.30 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1.31 # Otherwise a system limit (for SysV at least) may be exceeded.
1.32 .NOEXPORT:
.