diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-11-17 17:37:38 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-11-19 11:10:08 +0900 |
| commit | bb35cc7e30bf6593bed3e0ebad6c60adc0feda26 (patch) | |
| tree | 123d576bb0dd46da345cf123da4090d0dfe06c23 /tizen | |
| parent | 1ecd70fa097b790329e8d5cd378df8d81faf3785 (diff) | |
| download | qemu-bb35cc7e30bf6593bed3e0ebad6c60adc0feda26.tar.gz qemu-bb35cc7e30bf6593bed3e0ebad6c60adc0feda26.tar.bz2 qemu-bb35cc7e30bf6593bed3e0ebad6c60adc0feda26.zip | |
emulator: use cocoa UI as a default
Use cocoa UI as a default when a user wants to use a default console
provided by QEMU. It is mostly used with non-tizen disk images.
Change-Id: Ia9377f032bfdc79344a9b5e3c0163478c24d4640
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'tizen')
| -rwxr-xr-x | tizen/emulator_configure.sh | 3 | ||||
| -rw-r--r-- | tizen/src/emulator.c | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index cdd33abf48..045e054c88 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -174,8 +174,7 @@ CONFIGURE_APPEND=" --extra-cflags=-Wno-error=deprecated-declarations --extra-ldflags=-lstdc++ --audio-drv-list=coreaudio - --disable-cocoa - --disable-sdl + --enable-cocoa --enable-hax $CONFIGURE_APPEND " diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index 307a1e2f88..8d85458892 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -294,8 +294,11 @@ void start_skin(bool skin_enabled) } #endif +#ifdef CONFIG_COCOA +int cocoa_main(int argc, const char * argv[]); +#else int qemu_main(int argc, char **argv, char **envp); -int legacy_emulator_main(int argc, char **argv, char **envp); +#endif static int emulator_main(int argc, char *argv[], char **envp) { @@ -393,7 +396,11 @@ static int emulator_main(int argc, char *argv[], char **envp) print_options_info(); LOG_INFO("qemu main start...\n"); +#ifdef CONFIG_COCOA + cocoa_main(_qemu_argc, (const char **)_qemu_argv); +#else qemu_main(_qemu_argc, _qemu_argv, envp); +#endif return 0; } |