diff options
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index 93f15be..71100f3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -110,6 +110,7 @@ LOCAL_SRC_FILES += \ android/utils/assert.c \ android/utils/bufprint.c \ android/utils/debug.c \ + android/utils/dll.c \ android/utils/dirscanner.c \ android/utils/filelock.c \ android/utils/ini.c \ @@ -191,8 +192,9 @@ endif # Except if we used android-configure.sh --sdl-config=<script> # -ifneq ($(SDL_CONFIG),) +ifneq ($(QEMU_SDL_CONFIG),) BUILD_SDL_FROM_SOURCES := false + SDL_CONFIG := $(QEMU_SDL_CONFIG) endif ifneq ($(BUILD_SDL_FROM_SOURCES),true) @@ -422,6 +424,8 @@ CORE_MISC_SOURCES = \ android/qemu-setup.c \ android/snapshot.c \ android/utils/timezone.c \ + android/camera/camera-format-converters.c \ + android/camera/camera-service.c $(call gen-hw-config-defs) @@ -438,17 +442,24 @@ endif ifeq ($(HOST_OS),linux) CORE_MISC_SOURCES += usb-linux.c \ - qemu-thread.c + qemu-thread.c \ + android/camera/camera-capture-linux.c else CORE_MISC_SOURCES += usb-dummy-android.c endif ifeq ($(HOST_OS),windows) - CORE_MISC_SOURCES += tap-win32.c + CORE_MISC_SOURCES += tap-win32.c \ + android/camera/camera-capture-windows.c + else CORE_MISC_SOURCES += posix-aio-compat.c endif +ifeq ($(HOST_OS),darwin) + CORE_MISC_SOURCES += android/camera/camera-capture-mac.m +endif + LOCAL_SRC_FILES += $(CORE_MISC_SOURCES) # Required |