diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-09 15:59:28 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:17 +0200 |
| commit | 088edf82b3d34409ed9d9fd09ec1f7e9b933304f (patch) | |
| tree | b5515cf92d243d3453062a5bc975a494142442d3 /Makefile.target | |
| parent | 795bb19daea966401df15bbf23c57b98848eec23 (diff) | |
| download | external_qemu-088edf82b3d34409ed9d9fd09ec1f7e9b933304f.zip external_qemu-088edf82b3d34409ed9d9fd09ec1f7e9b933304f.tar.gz external_qemu-088edf82b3d34409ed9d9fd09ec1f7e9b933304f.tar.bz2 | |
os-posix.c + os-win32.c and dependencies
+ Generate qemu-options.def instead of qemu-options.h
Change-Id: I043e6b0c1c58e5cc2e96d05465f39b42f9054b5a
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index fb32582..0743987 100644 --- a/Makefile.target +++ b/Makefile.target @@ -206,6 +206,14 @@ MCHK_SOURCES := \ LOCAL_SRC_FILES += $(MCHK_SOURCES:%=memcheck/%) +# What a mess, os-posix.c depends on the exact values of options +# which are target specific. +ifeq ($(HOST_OS),windows) + LOCAL_SRC_FILES += os-win32.c oslib-win32.c +else + LOCAL_SRC_FILES += os-posix.c oslib-posix.c +endif +$(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c) $(call end-emulator-library) @@ -259,8 +267,8 @@ LOCAL_SRC_FILES := \ android/protocol/core-commands-impl.c \ android/protocol/core-commands-qemu.c \ -$(call gen-hx-header,qemu-monitor.hx,monitor.c) -$(call gen-hx-header,qemu-options.hx,vl-android.c) +$(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c) +$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c) ifeq ($(HOST_OS),darwin) FRAMEWORKS := OpenGL Cocoa QuickTime ApplicationServices Carbon IOKit @@ -337,8 +345,8 @@ LOCAL_SRC_FILES := \ android/protocol/ui-commands-qemu.c \ android/ -$(call gen-hx-header,qemu-monitor.hx,monitor.c) -$(call gen-hx-header,qemu-options.hx,vl-android.c) +$(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c) +$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c) # The following files cannot be in static libraries because they contain # constructor functions that are otherwise stripped by the final linker |