openbsd-ports/emulators/xmame/patches/patch-src_unix_unix_mak
naddy d23be30baf * restore fix for include order; error reported by espie@
* regen patches with update-patches
2002-02-06 02:05:08 +00:00

46 lines
1.6 KiB
Plaintext

$OpenBSD: patch-src_unix_unix_mak,v 1.6 2002/02/06 02:05:08 naddy Exp $
--- src/unix/unix.mak.orig Mon Dec 31 09:19:03 2001
+++ src/unix/unix.mak Wed Feb 6 02:18:56 2002
@@ -153,7 +153,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
@@ -174,7 +174,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)\"' \
- -DDISPLAY_METHOD='\"$(DISPLAY_METHOD)\"' -DXMAMEROOT='\"$(XMAMEROOT)\"'
+ -DDISPLAY_METHOD='\"$(DISPLAY_METHOD)\"' -DXMAMEROOT='\"$(SYSCONFDIR)\"'
ifdef HAVE_GETTIMEOFDAY
CONFIG += -DHAVE_GETTIMEOFDAY
@@ -210,7 +210,7 @@ CONFIG += -DLIN_FM_TOWNS
endif
ifdef JOY_USB
CONFIG += -DUSB_JOYSTICK
-MY_LIBS += -lusb
+MY_LIBS += -lusbhid
endif
ifdef EFENCE
@@ -363,12 +363,12 @@ install-man:
doinstall:
@echo installing binaries under $(BINDIR)...
-$(INSTALL_PROGRAM_DIR) $(BINDIR)
- $(INSTALL_PROGRAM) $(NAME).$(DISPLAY_METHOD) $(BINDIR)
+ $(INSTALL_PROGRAM) $(NAME).$(DISPLAY_METHOD) $(BINDIR)/$(NAME)
doinstallsuid:
@echo installing binaries under $(BINDIR)...
-$(INSTALL_PROGRAM_DIR) $(BINDIR)
- $(INSTALL_PROGRAM_SUID) $(NAME).$(DISPLAY_METHOD) $(BINDIR)
+ $(INSTALL_PROGRAM_SUID) $(NAME).$(DISPLAY_METHOD) $(BINDIR)/$(NAME)
copycab:
@echo installing cabinet files under $(XMAMEROOT)...