- cheat distfile changed; from Claudio Castiglia <ccastig@softhome.net>
- add USB joystick support - fix order of includes
This commit is contained in:
parent
aac1c8b95c
commit
0553c375b0
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2001/08/12 23:03:10 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2001/09/30 17:21:52 naddy Exp $
|
||||
|
||||
COMMENT= "emulates arcade machines and old home computers"
|
||||
COMMENT-mame= "emulates a massive variety of arcade machines"
|
||||
@ -21,7 +21,7 @@ MAINTAINER= Claudio Castiglia <ccastig@softhome.net>
|
||||
|
||||
HISCORE_FILE= hsdat7.zip
|
||||
HISTORY_FILE= history.zip
|
||||
CHEAT_FILE= cheat.zip
|
||||
CHEAT_FILE= cheat37b2.zip
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${HISCORE_FILE}:0 ${HISTORY_FILE}:1 \
|
||||
${CHEAT_FILE}:2
|
||||
|
||||
@ -83,7 +83,8 @@ MAKE_FLAGS= ARCH=openbsd \
|
||||
INSTALL_PROGRAM_SUID="${INSTALL_PROGRAM}" \
|
||||
INSTALL_MAN="${INSTALL_MAN}" \
|
||||
INSTALL_DATA="${INSTALL_DATA}" \
|
||||
SYSCONFDIR="${SYSCONFDIR}"
|
||||
SYSCONFDIR="${SYSCONFDIR}" \
|
||||
JOY_USB=1
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
MAKE_FLAGS+= MY_CPU=i386
|
||||
|
@ -1,12 +1,12 @@
|
||||
MD5 (cheat.zip) = dc380436c04780950cee07d3e31bfb0b
|
||||
MD5 (cheat37b2.zip) = dc380436c04780950cee07d3e31bfb0b
|
||||
MD5 (history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
|
||||
MD5 (hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
|
||||
MD5 (xmame-0.37b13.2.tar.bz2) = 70ec7ae3fba3110a6d85a7f5bfdb84f1
|
||||
RMD160 (cheat.zip) = 598af7e9d68e8f5938a9ac1ad8364e4636db483a
|
||||
RMD160 (cheat37b2.zip) = 598af7e9d68e8f5938a9ac1ad8364e4636db483a
|
||||
RMD160 (history.zip) = fe0201b578135aa0d2cfa22346adb799e4169cdf
|
||||
RMD160 (hsdat7.zip) = 908f7876f2735ae8d7b55c9a4f6d833323367b55
|
||||
RMD160 (xmame-0.37b13.2.tar.bz2) = a68eff01f59f5b437c8e03005be37bff525075b8
|
||||
SHA1 (cheat.zip) = 34360633f53632eabe5bb665d2729bebc300f253
|
||||
SHA1 (cheat37b2.zip) = 34360633f53632eabe5bb665d2729bebc300f253
|
||||
SHA1 (history.zip) = 194894b05620a1d9d4800634e0a7d91bc67d0ff2
|
||||
SHA1 (hsdat7.zip) = c55a193639f64156d70a832797e26371147893d9
|
||||
SHA1 (xmame-0.37b13.2.tar.bz2) = e7658678aee05ab11217d7e629752d1dc6dd38f4
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_unix_Makefile,v 1.1 2001/08/12 23:03:10 naddy Exp $
|
||||
--- src/unix/Makefile.orig Thu Jul 5 09:47:25 2001
|
||||
+++ src/unix/Makefile Thu Jul 5 09:47:43 2001
|
||||
@@ -100,7 +100,7 @@
|
||||
$OpenBSD: patch-src_unix_Makefile,v 1.2 2001/09/30 17:21:52 naddy Exp $
|
||||
--- src/unix/Makefile.orig Mon Apr 9 03:03:04 2001
|
||||
+++ src/unix/Makefile Sun Sep 30 17:51:42 2001
|
||||
@@ -100,7 +100,7 @@ CFLAGS.generic =
|
||||
#CFLAGS.aix = -DSYSDEP_DSP_AIX -I/usr/include/UMS -I/usr/lpp/som/include
|
||||
|
||||
#all cflags
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_unix_joystick-drivers_joy_usb_c,v 1.1 2001/09/30 17:21:52 naddy Exp $
|
||||
--- src/unix/joystick-drivers/joy_usb.c.orig Sun Sep 30 17:43:03 2001
|
||||
+++ src/unix/joystick-drivers/joy_usb.c Sun Sep 30 17:45:54 2001
|
||||
@@ -15,12 +15,12 @@ struct rc_option joy_usb_opts[] = {
|
||||
|
||||
#ifdef USB_JOYSTICK
|
||||
|
||||
-#if !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd)
|
||||
-#error "USB joysticks are only supported under NetBSD and FreeBSD. "
|
||||
+#if !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) && !defined(__ARCH_openbsd)
|
||||
+#error "USB joysticks are only supported under NetBSD, FreeBSD, and OpenBSD. "
|
||||
"Patches to support other archs are welcome ;)"
|
||||
#endif
|
||||
|
||||
-#if defined(__ARCH_netbsd)
|
||||
+#if defined(__ARCH_netbsd) || defined(__ARCH_openbsd)
|
||||
#include <usb.h>
|
||||
#elif defined(__ARCH_freebsd)
|
||||
#include <libusb.h>
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_unix_unix_mak,v 1.2 2001/08/12 23:03:10 naddy Exp $
|
||||
--- src/unix/unix.mak.orig Sun Apr 8 22:54:42 2001
|
||||
+++ src/unix/unix.mak Mon Aug 6 07:05:14 2001
|
||||
@@ -50,7 +50,7 @@
|
||||
$OpenBSD: patch-src_unix_unix_mak,v 1.3 2001/09/30 17:21:52 naddy Exp $
|
||||
--- src/unix/unix.mak.orig Mon Apr 9 03:54:42 2001
|
||||
+++ src/unix/unix.mak Sun Sep 30 18:35:11 2001
|
||||
@@ -50,7 +50,7 @@ LIBS.xgl = $(X11LIB) $(JOY_X11_LI
|
||||
LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
|
||||
LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
|
||||
LIBS.openstep = -framework AppKit
|
||||
@ -10,7 +10,16 @@ $OpenBSD: patch-src_unix_unix_mak,v 1.2 2001/08/12 23:03:10 naddy Exp $
|
||||
LIBS.photon2 = -L/usr/lib -lph -lphrender
|
||||
|
||||
CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS)
|
||||
@@ -166,7 +166,7 @@
|
||||
@@ -145,7 +145,7 @@ MY_CFLAGS = $(CFLAGS) $(IL) $(CFLAGS.$(M
|
||||
-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp \
|
||||
-DPI=M_PI -DUNIX -DSIGNED_SAMPLES \
|
||||
$(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
|
||||
- $(INCLUDES) $(INCLUDE_PATH)
|
||||
+ $(INCLUDE_PATH) $(INCLUDES)
|
||||
|
||||
MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz
|
||||
|
||||
@@ -166,7 +166,7 @@ endif
|
||||
# CONFIG are the cflags used to build the unix tree, this is were most defines
|
||||
# go
|
||||
CONFIG = $(MY_CFLAGS) $(CFLAGS.$(DISPLAY_METHOD)) -DNAME='\"x$(TARGET)\"' \
|
||||
@ -19,7 +28,7 @@ $OpenBSD: patch-src_unix_unix_mak,v 1.2 2001/08/12 23:03:10 naddy Exp $
|
||||
|
||||
ifdef HAVE_GETTIMEOFDAY
|
||||
CONFIG += -DHAVE_GETTIMEOFDAY
|
||||
@@ -345,12 +345,12 @@
|
||||
@@ -345,12 +345,12 @@ install-man:
|
||||
doinstall:
|
||||
@echo installing binaries under $(BINDIR)...
|
||||
-$(INSTALL_PROGRAM_DIR) $(BINDIR)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy Exp $
|
||||
--- src/unix/video-drivers/gltool.c.orig Sat Aug 11 21:54:56 2001
|
||||
+++ src/unix/video-drivers/gltool.c Sat Aug 11 22:30:50 2001
|
||||
@@ -355,7 +355,8 @@
|
||||
$OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.2 2001/09/30 17:21:52 naddy Exp $
|
||||
--- src/unix/video-drivers/gltool.c.orig Sun Apr 8 22:13:26 2001
|
||||
+++ src/unix/video-drivers/gltool.c Sun Sep 30 17:51:42 2001
|
||||
@@ -355,7 +355,8 @@ void * LIBAPIENTRY getGLProcAddressHelpe
|
||||
|
||||
if (disp__glXGetProcAddress == NULL && __firstAccess)
|
||||
{
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy E
|
||||
|
||||
if (disp__glXGetProcAddress != NULL && verbose)
|
||||
{
|
||||
@@ -365,7 +366,8 @@
|
||||
@@ -365,7 +366,8 @@ void * LIBAPIENTRY getGLProcAddressHelpe
|
||||
|
||||
if (disp__glXGetProcAddress == NULL)
|
||||
{
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy E
|
||||
|
||||
if (disp__glXGetProcAddress != NULL && verbose)
|
||||
{
|
||||
@@ -376,7 +378,8 @@
|
||||
@@ -376,7 +378,8 @@ void * LIBAPIENTRY getGLProcAddressHelpe
|
||||
|
||||
if (disp__glXGetProcAddress == NULL)
|
||||
{
|
||||
@ -31,7 +31,7 @@ $OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy E
|
||||
|
||||
if (disp__glXGetProcAddress != NULL && verbose)
|
||||
{
|
||||
@@ -392,7 +395,8 @@
|
||||
@@ -392,7 +395,8 @@ void * LIBAPIENTRY getGLProcAddressHelpe
|
||||
fflush (NULL);
|
||||
if (libHandleGLX != NULL)
|
||||
{
|
||||
@ -41,7 +41,7 @@ $OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy E
|
||||
|
||||
if (disp__glXGetProcAddress != NULL && verbose)
|
||||
{
|
||||
@@ -402,7 +406,8 @@
|
||||
@@ -402,7 +406,8 @@ void * LIBAPIENTRY getGLProcAddressHelpe
|
||||
|
||||
if (disp__glXGetProcAddress == NULL)
|
||||
{
|
||||
@ -51,7 +51,7 @@ $OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy E
|
||||
|
||||
if (disp__glXGetProcAddress != NULL && verbose)
|
||||
{
|
||||
@@ -413,7 +418,8 @@
|
||||
@@ -413,7 +418,8 @@ void * LIBAPIENTRY getGLProcAddressHelpe
|
||||
|
||||
if (disp__glXGetProcAddress == NULL)
|
||||
{
|
||||
@ -61,7 +61,7 @@ $OpenBSD: patch-src_unix_videodrivers_gltool_c,v 1.1 2001/08/12 23:03:10 naddy E
|
||||
|
||||
if (disp__glXGetProcAddress != NULL && verbose)
|
||||
{
|
||||
@@ -539,7 +545,7 @@
|
||||
@@ -539,7 +545,7 @@ void LIBAPIENTRY fetch_GL_FUNCS (const c
|
||||
if(!loadGLLibrary (libGLName, libGLUName))
|
||||
return;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_unix_videodrivers_glxtool_c,v 1.1 2001/08/12 23:03:10 naddy Exp $
|
||||
--- src/unix/video-drivers/glxtool.c.orig Sat Aug 11 22:03:52 2001
|
||||
+++ src/unix/video-drivers/glxtool.c Sat Aug 11 22:05:53 2001
|
||||
@@ -29,7 +29,7 @@
|
||||
$OpenBSD: patch-src_unix_videodrivers_glxtool_c,v 1.2 2001/09/30 17:21:52 naddy Exp $
|
||||
--- src/unix/video-drivers/glxtool.c.orig Sun Apr 8 22:13:26 2001
|
||||
+++ src/unix/video-drivers/glxtool.c Sun Sep 30 17:51:42 2001
|
||||
@@ -29,7 +29,7 @@ void LIBAPIENTRY fetch_GLX_FUNCS (const
|
||||
if(!_firstRun)
|
||||
return;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user