From 4fb9d7c6d0fb66c172857b245319315a881be32c Mon Sep 17 00:00:00 2001
From: "Kenneth C. Arnold" <kcarnold@xiph.org>
Date: Sat, 30 Sep 2000 01:16:15 +0000
Subject: [PATCH] Trying to get libao to compile properly. This is at least an
improvement. See post on mailing list for more info.
git-svn-id: http://svn.xiph.org/trunk/ao@704 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
include/ao/ao.h | 2 ++
src/Makefile.am | 8 ++++++--
src/ao_alsa.c | 2 +-
src/ao_oss.c | 2 +-
src/ao_wav.c | 2 +-
src/audio_out.c | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/include/ao/ao.h b/include/ao/ao.h
index 87d7102..7457dca 100644
--- a/include/ao/ao.h
+++ b/include/ao/ao.h
@@ -26,6 +26,8 @@
#include <stdlib.h>
+#include "os_types.h"
+
// Type sizes
#include "config.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bc6466..9a9034e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,17 @@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
lib_LTLIBRARIES = libao.la
-libao_la_SOURCES = audio_out.c @LIBAO_FILES@
+#libao_la_SOURCES = audio_out.c @LIBAO_FILES@
+libao_la_SOURCES = audio_out.c ao_oss.c ao_wav.c ao_null.c
libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+EXTRA_libao_la_SOURCES = ao_alsa.c ao_irix.c ao_oss.c ao_wav.c ao_esd.c ao_null.c ao_solaris.c audio_out.c
+
+
debug:
$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/src/ao_alsa.c b/src/ao_alsa.c
index 20ef05a..4c595ca 100644
--- a/src/ao_alsa.c
+++ b/src/ao_alsa.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <sys/asoundlib.h>
-#include "audio_out.h"
+#include <ao/ao.h>
#define AO_ALSA_BUF_SIZE 32768
diff --git a/src/ao_oss.c b/src/ao_oss.c
index 395f5b3..82f0a40 100644
--- a/src/ao_oss.c
+++ b/src/ao_oss.c
@@ -39,7 +39,7 @@
#endif
#include <sys/ioctl.h>
-#include "audio_out.h"
+#include <ao/ao.h>
static ao_info_t ao_oss_info =
{
diff --git a/src/ao_wav.c b/src/ao_wav.c
index 0c542e2..0d2167b 100644
--- a/src/ao_wav.c
+++ b/src/ao_wav.c
@@ -32,7 +32,7 @@
#include <fcntl.h>
#include <signal.h>
-#include "audio_out.h"
+#include <ao/ao.h>
#define WAVE_FORMAT_PCM 0x0001
#define FORMAT_MULAW 0x0101
diff --git a/src/audio_out.c b/src/audio_out.c
index 59fb739..4812cd8 100644
--- a/src/audio_out.c
+++ b/src/audio_out.c
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include "audio_out.h"
+#include <ao/ao.h>
/* --- Function Tables --- */
--
GitLab