From 66978056c9171f2e4db37491fd7d7f9c039d4c4b Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Tue, 7 Jul 2015 21:40:48 -0700 Subject: [PATCH] Build system tweaks --- Android/jni/sources.mk | 2 +- configure.ac | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Android/jni/sources.mk b/Android/jni/sources.mk index cb23c508..272f742b 100644 --- a/Android/jni/sources.mk +++ b/Android/jni/sources.mk @@ -24,7 +24,7 @@ APPLE2_VIDEO_SRC = \ APPLE2_AUDIO_SRC = \ $(APPLE2_SRC_PATH)/audio/soundcore.c $(APPLE2_SRC_PATH)/audio/soundcore-opensles.c $(APPLE2_SRC_PATH)/audio/speaker.c \ - $(APPLE2_SRC_PATH)/audio/playqueue.c $(APPLE2_SRC_PATH)/audio/mockingboard.c $(APPLE2_SRC_PATH)/audio/AY8910.c + $(APPLE2_SRC_PATH)/audio/mockingboard.c $(APPLE2_SRC_PATH)/audio/AY8910.c APPLE2_META_SRC = \ $(APPLE2_SRC_PATH)/meta/debug.c $(APPLE2_SRC_PATH)/meta/debugger.c $(APPLE2_SRC_PATH)/meta/opcodes.c \ diff --git a/configure.ac b/configure.ac index 580f16c1..554b3029 100644 --- a/configure.ac +++ b/configure.ac @@ -224,7 +224,6 @@ AC_ARG_ENABLE([audio], AS_HELP_STRING([--disable-audio], [Disable emulator audio AC_CHECK_HEADER(AL/alext.h, [ AC_SEARCH_LIBS(alcOpenDevice, openal, [ dnl found OpenAL ... - AC_DEFINE(AUDIO_OPENAL, 1, [Enable OpenAL audio output]) AC_DEFINE(AUDIO_ENABLED, 1, [Enable sound module]) AUDIO_GLUE_C="src/audio/speaker.c src/audio/mockingboard.c src/audio/playqueue.c" AUDIO_O="src/audio/soundcore.o src/audio/soundcore-openal.o src/audio/speaker.o src/audio/playqueue.o src/audio/alhelpers.o src/audio/mockingboard.o src/audio/AY8910.o"