diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 09:03:18 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 09:03:18 -0700 |
| commit | 497d910c85598a75cc2be2ea932c44036c854fc3 (patch) | |
| tree | 567e8ce139138e5d6bcb8f14e86dc3cb99a0df1e /android-configure.sh | |
| parent | a3abe794b734382295b89d6c2d1d176ce4bb9b4b (diff) | |
| parent | 5d8f37ad78fc66901af50c762029a501561f3b23 (diff) | |
| download | external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.zip external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.tar.gz external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.tar.bz2 | |
resolved conflicts for merge of 5d8f37ad to eclair-plus-aosp
Diffstat (limited to 'android-configure.sh')
| -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 16e0d4d..77ed5ec 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -403,7 +403,8 @@ echo "#define CONFIG_TRACE 1" >> $config_h if [ "$OS" != "windows" ] ; then echo "#define CONFIG_NAND_LIMITS 1" >> $config_h fi -echo "#define QEMU_VERSION \"0.8.2\"" >> $config_h +echo "#define QEMU_VERSION \"0.10.50\"" >> $config_h +echo "#define QEMU_PKGVERSION \"Android\"" >> $config_h case "$CPU" in x86) CONFIG_CPU=I386 ;; @@ -429,12 +430,26 @@ case "$OS" in ;; *) CONFIG_OS=$OS esac + +case $OS in + linux-*|darwin-*) + echo "#define HAVE_IOVEC 1" >> $config_h + ;; +esac + +case $OS in + linux-*) + echo "#define CONFIG_IOTHREAD 1" >> $config_h + ;; +esac + echo "#define CONFIG_$CONFIG_OS 1" >> $config_h if [ $BSD = 1 ] ; then echo "#define _BSD 1" >> $config_h echo "#define O_LARGEFILE 0" >> $config_h echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h fi + log "Generate : $config_h" echo "Ready to go. Type 'make' to build emulator" |