diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-06-01 07:23:05 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-06-01 07:23:05 -0700 |
| commit | dd49c5ced10df149f9d4b27d22885c0c6b2a9539 (patch) | |
| tree | 89e27c4b58f9fcdb53285bc76da5385f57d330c8 | |
| parent | 3650087bd680b1d5c9f8de6c510305e6829662bb (diff) | |
| parent | 826b985e543e12f83c396922d9c6562050e0f9f6 (diff) | |
| download | external_qemu-dd49c5ced10df149f9d4b27d22885c0c6b2a9539.zip external_qemu-dd49c5ced10df149f9d4b27d22885c0c6b2a9539.tar.gz external_qemu-dd49c5ced10df149f9d4b27d22885c0c6b2a9539.tar.bz2 | |
Merge "android-configure.sh: fix KVM-enabled builds."
| -rwxr-xr-x | android-configure.sh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/android-configure.sh b/android-configure.sh index 02e4d99..5a1748c 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -202,7 +202,7 @@ if [ -n "$SDL_CONFIG" ] ; then SDL_LIBS=`$SDL_CONFIG --static-libs` # quick hack, remove the -D_GNU_SOURCE=1 of some SDL Cflags - # since they break recent Mingw releases +7 # since they break recent Mingw releases SDL_CFLAGS=`echo $SDL_CFLAGS | sed -e s/-D_GNU_SOURCE=1//g` log "SDL-probe : SDL_CFLAGS = $SDL_CFLAGS" @@ -460,6 +460,21 @@ echo "#define CONFIG_SLIRP 1" >> $config_h echo "#define CONFIG_SKINS 1" >> $config_h echo "#define CONFIG_TRACE 1" >> $config_h +case "$TARGET_OS" in + windows) + echo "#define CONFIG_WIN32 1" >> $config_h + ;; + *) + echo "#define CONFIG_POSIX 1" >> $config_h + ;; +esac + +case "$TARGET_OS" in + linux-*) + echo "#define CONFIG_KVM_GS_RESTORE 1" >> $config_h + ;; +esac + # only Linux has fdatasync() case "$TARGET_OS" in linux-*) |