Added CD-ROM support for BSD/OS (thanks Steven!)

libsdl-org · Sep 13, 2001 · f424052 · f424052
1 parent f0d68ad
commit f424052
Show file tree

Hide file tree

Showing 5 changed files with 568 additions and 4 deletions.
diff --git a/configure.in b/configure.in
@@ -1347,18 +1347,18 @@ case "$target" in
             JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
         fi
         # Set up files for the cdrom library
-        # (No cdrom support yet)
         if test x$enable_cdrom = xyes; then
-            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
-            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
+            CDROM_SUBDIRS="$CDROM_SUBDIRS bsdi"
+            CDROM_DRIVERS="$CDROM_DRIVERS bsdi/libcdrom_bsdi.la"
         fi
         # Set up files for the thread library
+        SDL_LIBS="$SDL_LIBS -lsem"
         if test x$enable_threads = xyes; then
             COPY_ARCH_SRC(src/thread, linux, SDL_systhread.c)
             COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
             COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c)
             COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h)
-            COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c)
+            COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c)
             COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h)
             COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c)
             COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h)
@@ -2247,6 +2247,7 @@ src/cdrom/Makefile
 src/cdrom/aix/Makefile
 src/cdrom/beos/Makefile
 src/cdrom/dummy/Makefile
+src/cdrom/bsdi/Makefile
 src/cdrom/freebsd/Makefile
 src/cdrom/linux/Makefile
 src/cdrom/macos/Makefile

diff --git a/docs.html b/docs.html
@@ -16,8 +16,10 @@ <H2>
 Major changes since SDL 1.0.0:
 </H2>
 <UL>
+	<LI> 1.2.3: Added CD-ROM support for BSD/OS (thanks Steven!)
 	<LI> 1.2.3: Added library version information to the Windows DLL
 	<LI> 1.2.3: Added initial support for EPOC/Symbian OS (thanks Hannu!)
+	<LI> 1.2.3: Added a joystick driver for  MacOS X (thanks Max!)
 	<LI> 1.2.3: Improved MacOS X international keyboard handling
 	<LI> 1.2.3: Added support for DirectFB video on Linux (thanks Denis!)
 	<LI> 1.2.3: Fixed IDE and SCSI CD-ROM detection on BeOS (thanks Caz!)

diff --git a/src/cdrom/bsdi/.cvsignore b/src/cdrom/bsdi/.cvsignore
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la
diff --git a/src/cdrom/bsdi/Makefile.am b/src/cdrom/bsdi/Makefile.am
@@ -0,0 +1,8 @@
+
+## Makefile.am for the BSDi cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_bsdi.la
+libcdrom_bsdi_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c