filename | configure.in |
changeset | 1245:01e0020adf88 |
prev | 1239:be3121267597 |
next | 1266:e6079b9c69ba |
author | nkeynes |
date | Mon Mar 05 17:39:32 2012 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Remove check for Maple sender address. Need to test behaviour of this on DC Patch from guinux, thanks! |
file | annotate | diff | log | raw |
1.1 --- a/configure.in Sat Feb 25 21:30:49 2012 +10001.2 +++ b/configure.in Mon Mar 05 17:39:32 2012 +10001.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.7 -1.8 -dnl ------------ Check if we're building on Darwin --------------1.9 +dnl ------------ Check if we're building on Darwin or Android --------------1.11 dnl For starters, do we have a working objective-c compiler?1.12 if test "$ANDROID_BUILD" = "yes"; then1.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=no1.20 else1.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"; then1.28 with_gtk=no1.29 fi1.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.37 dnl Which GTK port do we have?1.38 @@ -485,18 +487,14 @@1.39 echo "Configuration complete"1.40 echo1.42 -if test "x$HAVE_GTK" = x; then1.43 - if test "x$HAVE_COCOA" = x; then1.44 - echo " User interface: none"1.45 - else1.46 - echo " User interface: Cocoa"1.47 - fi1.48 +if test "x$UI_DRIVER" = x; then1.49 + echo " User interface: none"1.50 else1.51 - echo " User interface: GTK"1.52 + echo " User interface: $UI_DRIVER"1.53 fi1.55 if test "x$SH4_TRANSLATOR" = "x"; then1.56 - echo " SH4 translator: None (emulation core only)"1.57 + echo " SH4 translator: none (emulation core only)"1.58 else1.59 echo " SH4 translator: $SH4_TRANSLATOR"1.60 fi
.