Search
lxdream.org :: lxdream/configure.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure.in
changeset 1245:01e0020adf88
prev1239:be3121267597
next1266:e6079b9c69ba
author nkeynes
date Fri Mar 02 23:49:10 2012 +1000 (9 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/configure.in Sat Feb 25 21:30:49 2012 +1000
1.2 +++ b/configure.in Fri Mar 02 23:49:10 2012 +1000
1.3 @@ -79,15 +79,15 @@
1.4 AC_ARG_WITH( sdl,
1.5 AS_HELP_STRING( [--with-sdl], [Build with support for SDL audio]) )
1.6
1.7 -
1.8 -dnl ------------ Check if we're building on Darwin --------------
1.9 +dnl ------------ Check if we're building on Darwin or Android --------------
1.10
1.11 dnl For starters, do we have a working objective-c compiler?
1.12 if test "$ANDROID_BUILD" = "yes"; then
1.13 with_gtk=no;
1.14 EXTRA_OUTPUT_FILES="src/android/build.properties"
1.15 - LIBS="-lGLESv2 $LIBS"
1.16 + LIBS="-lEGL -lGLESv2 $LIBS"
1.17 AC_DEFINE(HAVE_GLES2, 1, [Using GLESv2])
1.18 + UI_DRIVER="Android"
1.19 with_sdl=no
1.20 else
1.21 AC_HAVE_OBJC([
1.22 @@ -100,6 +100,7 @@
1.23 LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"
1.24 AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework])
1.25 AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])
1.26 + UI_DRIVER="Cocoa"
1.27 if test "x$with_gtk" = "xx11"; then
1.28 with_gtk=no
1.29 fi
1.30 @@ -230,6 +231,7 @@
1.31 PKG_CHECK_MODULES(GTK, gtk+-2.0, [
1.32 HAVE_GTK='yes'
1.33 AC_DEFINE([HAVE_GTK],1,[Have GTK libraries])
1.34 + UI_DRIVER="GTK"
1.35 ])
1.36
1.37 dnl Which GTK port do we have?
1.38 @@ -485,18 +487,14 @@
1.39 echo "Configuration complete"
1.40 echo
1.41
1.42 -if test "x$HAVE_GTK" = x; then
1.43 - if test "x$HAVE_COCOA" = x; then
1.44 - echo " User interface: none"
1.45 - else
1.46 - echo " User interface: Cocoa"
1.47 - fi
1.48 +if test "x$UI_DRIVER" = x; then
1.49 + echo " User interface: none"
1.50 else
1.51 - echo " User interface: GTK"
1.52 + echo " User interface: $UI_DRIVER"
1.53 fi
1.54
1.55 if test "x$SH4_TRANSLATOR" = "x"; then
1.56 - echo " SH4 translator: None (emulation core only)"
1.57 + echo " SH4 translator: none (emulation core only)"
1.58 else
1.59 echo " SH4 translator: $SH4_TRANSLATOR"
1.60 fi
.