Added sound support.

This commit is contained in:
Steven Wallace 1995-03-06 08:13:37 +00:00
parent b4fd20d4a0
commit 1427eec80f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=1100
3 changed files with 83 additions and 51 deletions

View File

@ -1,54 +1,3 @@
diff -rc ../xboing2.2.orig/Imakefile ./Imakefile
*** ../xboing2.2.orig/Imakefile Thu Jun 2 02:11:10 1994
--- ./Imakefile Wed Feb 1 00:26:57 1995
***************
*** 5,17 ****
XCOMM This is the directory where the highscore, level & sound data will be
XCOMM placed. Default will be the current directory.
! XBOING_DIR = .
XCOMM These are some defines that must be set. Some may be overwritten in the
XCOMM machine arch section.
! XPMLIB = -L../xpm3.4/lib -lXpm
! XPMINCLUDE = -I../xpm3.4/lib
XBOINGINCLUDE = -I./include
LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
SOUNDS_DIR = $(XBOING_DIR)/sounds
--- 5,17 ----
XCOMM This is the directory where the highscore, level & sound data will be
XCOMM placed. Default will be the current directory.
! XBOING_DIR = /usr/X11R6/lib/X11/xboing
XCOMM These are some defines that must be set. Some may be overwritten in the
XCOMM machine arch section.
! XPMLIB = -lXpm
! XPMINCLUDE = -I/usr/X11R6/include/X11
XBOINGINCLUDE = -I./include
LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
SOUNDS_DIR = $(XBOING_DIR)/sounds
***************
*** 98,105 ****
-DLEVEL_INSTALL_DIR=\"$(LEVEL_INSTALL_DIR)\" \
-DAUDIO_AVAILABLE=\"$(AUDIO_AVAILABLE)\" \
-DSOUNDS_DIR=\"$(SOUNDS_DIR)\" \
! -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\"
! XCOMM -DUSE_FLOCK=\"True\" \
XCOMM -DNO_LOCKING=\"True\"
LOCAL_LIBRARIES = $(AUDIO_LIB) $(XPMLIB) $(XLIB) -lm
--- 98,105 ----
-DLEVEL_INSTALL_DIR=\"$(LEVEL_INSTALL_DIR)\" \
-DAUDIO_AVAILABLE=\"$(AUDIO_AVAILABLE)\" \
-DSOUNDS_DIR=\"$(SOUNDS_DIR)\" \
! -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\" \
! -DUSE_FLOCK=\"True\"
XCOMM -DNO_LOCKING=\"True\"
LOCAL_LIBRARIES = $(AUDIO_LIB) $(XPMLIB) $(XLIB) -lm
diff -rc ../xboing2.2.orig/include/misc.h ./include/misc.h
*** ../xboing2.2.orig/include/misc.h Wed May 25 01:32:15 1994
--- ./include/misc.h Wed Feb 1 00:37:19 1995

View File

@ -0,0 +1,19 @@
*** audio/LINUXaudio.c.orig Tue May 24 16:34:59 1994
--- audio/LINUXaudio.c Sun Mar 5 23:43:14 1995
***************
*** 38,44 ****
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
! #include <linux/soundcard.h>
#include "include/error.h"
#include "include/audio.h"
--- 38,44 ----
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
! #include <machine/soundcard.h>
#include "include/error.h"
#include "include/audio.h"

View File

@ -0,0 +1,64 @@
*** Imakefile.orig Wed Jun 1 17:11:10 1994
--- Imakefile Sun Mar 5 23:43:55 1995
***************
*** 5,24 ****
XCOMM This is the directory where the highscore, level & sound data will be
XCOMM placed. Default will be the current directory.
! XBOING_DIR = .
XCOMM These are some defines that must be set. Some may be overwritten in the
XCOMM machine arch section.
! XPMLIB = -L../xpm3.4/lib -lXpm
! XPMINCLUDE = -I../xpm3.4/lib
XBOINGINCLUDE = -I./include
LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
SOUNDS_DIR = $(XBOING_DIR)/sounds
BACKUP_DIR = $(XBOING_DIR)/../backups
HIGH_SCORE_FILE = $(XBOING_DIR)/xboing.scr
! AUDIO_AVAILABLE = False
! AUDIO_SRC = audio/NOaudio.c
AUDIO_INCLUDE =
AUDIO_LIB =
--- 5,24 ----
XCOMM This is the directory where the highscore, level & sound data will be
XCOMM placed. Default will be the current directory.
! XBOING_DIR = /usr/X11R6/lib/X11/xboing
XCOMM These are some defines that must be set. Some may be overwritten in the
XCOMM machine arch section.
! XPMLIB = -lXpm
! XPMINCLUDE = -I/usr/X11R6/include/X11
XBOINGINCLUDE = -I./include
LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
SOUNDS_DIR = $(XBOING_DIR)/sounds
BACKUP_DIR = $(XBOING_DIR)/../backups
HIGH_SCORE_FILE = $(XBOING_DIR)/xboing.scr
! AUDIO_AVAILABLE = True
! AUDIO_SRC = audio/LINUXaudio.c
AUDIO_INCLUDE =
AUDIO_LIB =
***************
*** 98,105 ****
-DLEVEL_INSTALL_DIR=\"$(LEVEL_INSTALL_DIR)\" \
-DAUDIO_AVAILABLE=\"$(AUDIO_AVAILABLE)\" \
-DSOUNDS_DIR=\"$(SOUNDS_DIR)\" \
! -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\"
! XCOMM -DUSE_FLOCK=\"True\" \
XCOMM -DNO_LOCKING=\"True\"
LOCAL_LIBRARIES = $(AUDIO_LIB) $(XPMLIB) $(XLIB) -lm
--- 98,105 ----
-DLEVEL_INSTALL_DIR=\"$(LEVEL_INSTALL_DIR)\" \
-DAUDIO_AVAILABLE=\"$(AUDIO_AVAILABLE)\" \
-DSOUNDS_DIR=\"$(SOUNDS_DIR)\" \
! -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\" \
! -DUSE_FLOCK=\"True\"
XCOMM -DNO_LOCKING=\"True\"
LOCAL_LIBRARIES = $(AUDIO_LIB) $(XPMLIB) $(XLIB) -lm