Skip to content
Permalink
Browse files
Fixed IDE and SCSI CD-ROM detection on BeOS (thanks Caz!)
  • Loading branch information
slouken committed Aug 18, 2001
1 parent fc3bdc3 commit 59860132cdb217e9e6441b1dfe903c43d6aa8da4
@@ -1237,7 +1237,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, linux, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS linux"
CDROM_DRIVERS="$CDROM_DRIVERS linux/libcdrom_linux.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1302,7 +1303,8 @@ case "$target" in
# Set up files for the cdrom library
# (No cdrom support yet)
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1353,7 +1355,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, freebsd, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS freebsd"
CDROM_DRIVERS="$CDROM_DRIVERS freebsd/libcdrom_freebsd.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1404,7 +1407,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, openbsd, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd"
CDROM_DRIVERS="$CDROM_DRIVERS openbsd/libcdrom_openbsd.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1463,7 +1467,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, openbsd, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd"
CDROM_DRIVERS="$CDROM_DRIVERS openbsd/libcdrom_openbsd.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1517,7 +1522,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1566,7 +1572,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, linux, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS linux"
CDROM_DRIVERS="$CDROM_DRIVERS linux/libcdrom_linux.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1612,7 +1619,8 @@ case "$target" in
# Set up files for the cdrom library
# (No CD-ROM support yet)
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1673,7 +1681,8 @@ case "$target" in
# Set up files for the cdrom library
# (No CD-ROM support yet)
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1717,7 +1726,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, aix, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS aix"
CDROM_DRIVERS="$CDROM_DRIVERS aix/libcdrom_aix.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1762,7 +1772,8 @@ case "$target" in
# Set up files for the cdrom library
# (No cdrom support yet)
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1806,7 +1817,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, qnx, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS qnx"
CDROM_DRIVERS="$CDROM_DRIVERS qnx/libcdrom_qnx.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1858,7 +1870,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, win32, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS win32"
CDROM_DRIVERS="$CDROM_DRIVERS win32/libcdrom_win32.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1913,7 +1926,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, beos, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS beos"
CDROM_DRIVERS="$CDROM_DRIVERS beos/libcdrom_beos.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -1956,7 +1970,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, macos, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS macos"
CDROM_DRIVERS="$CDROM_DRIVERS macos/libcdrom_macos.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -2002,7 +2017,8 @@ case "$target" in
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -2077,6 +2093,8 @@ AC_SUBST(VIDEO_SUBDIRS)
AC_SUBST(VIDEO_DRIVERS)
AC_SUBST(JOYSTICK_SUBDIRS)
AC_SUBST(JOYSTICK_DRIVERS)
AC_SUBST(CDROM_SUBDIRS)
AC_SUBST(CDROM_DRIVERS)
AC_SUBST(SDL_EXTRADIRS)
AC_SUBST(SDL_EXTRALIBS)
AC_SUBST(SYSTEM_LIBS)
@@ -2164,6 +2182,15 @@ src/joystick/linux/Makefile
src/joystick/macos/Makefile
src/joystick/win32/Makefile
src/cdrom/Makefile
src/cdrom/aix/Makefile
src/cdrom/beos/Makefile
src/cdrom/dummy/Makefile
src/cdrom/freebsd/Makefile
src/cdrom/linux/Makefile
src/cdrom/macos/Makefile
src/cdrom/openbsd/Makefile
src/cdrom/qnx/Makefile
src/cdrom/win32/Makefile
src/thread/Makefile
src/timer/Makefile
src/endian/Makefile
@@ -16,6 +16,7 @@ <H2>
Major changes since SDL 1.0.0:
</H2>
<UL>
<LI> 1.2.3: Fixed IDE and SCSI CD-ROM detection on BeOS (thanks Caz!)
<LI> 1.2.3: Fixed the system dependent SDL_WINDOWID hack on Windows
<LI> 1.2.3: Added 640x480 as a scaled resolution for NTSC/PAL output
<LI> 1.2.3: Added support for TV output on the Linux PlayStation Beta
@@ -3,27 +3,17 @@

noinst_LTLIBRARIES = libcdrom.la

ARCH_SUBDIRS = $(srcdir)/dummy $(srcdir)/beos $(srcdir)/freebsd \
$(srcdir)/linux $(srcdir)/macos $(srcdir)/openbsd \
$(srcdir)/qnx $(srcdir)/win32
# Define which subdirectories need to be built
SUBDIRS = @CDROM_SUBDIRS@
DIST_SUBDIRS = aix beos dummy freebsd linux macos openbsd qnx win32

# Include the architecture-independent sources
COMMON_SRCS = SDL_cdrom.c SDL_syscdrom.h

# Include the architecture-specific sources
ARCH_SRCS = SDL_syscdrom.c

libcdrom_la_SOURCES = $(COMMON_SRCS) $(ARCH_SRCS)
DRIVERS = @CDROM_DRIVERS@

## Let automake know that it shouldn't distribute linked sources
BUILT_SOURCES = $(ARCH_SRCS)

## Let automake know that it should remove these for distribution
DISTCLEANFILES = $(ARCH_SRCS)
# Include the architecture-independent sources
COMMON_SRCS = \
SDL_cdrom.c \
SDL_syscdrom.h

# The architecture specific directories need to be copied into place
# when building a distribution.
dist-hook:
(cd $(distdir) && rm -f $(BUILT_SOURCES))
cp -rp $(ARCH_SUBDIRS) $(distdir)
(cd $(distdir) && rm -rf `find . -name CVS`)
libcdrom_la_SOURCES = $(COMMON_SRCS)
libcdrom_la_LIBADD = $(DRIVERS)
libcdrom_la_DEPENDENCIES = $(DRIVERS)
@@ -0,0 +1,6 @@
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
@@ -0,0 +1,8 @@

## Makefile.am for the AIX cdrom driver for SDL

noinst_LTLIBRARIES = libcdrom_aix.la
libcdrom_aix_la_SOURCES = $(SRCS)

# The SDL cdrom driver sources
SRCS = SDL_syscdrom.c
@@ -0,0 +1,6 @@
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
@@ -0,0 +1,8 @@

## Makefile.am for the BeOS cdrom driver for SDL

noinst_LTLIBRARIES = libcdrom_beos.la
libcdrom_beos_la_SOURCES = $(SRCS)

# The SDL cdrom driver sources
SRCS = SDL_syscdrom.cc
Loading

0 comments on commit 5986013

Please sign in to comment.