2013-09-26 17:14:40 +02:00

74 lines
2.0 KiB
Plaintext

$NetBSD: patch-aa,v 1.3 2012/06/23 19:45:06 dholland Exp $
- add DragonFly support
- add Solaris support
- honor pkgsrc LDFLAGS
--- Makefile.orig 2009-07-05 05:43:49.000000000 +0000
+++ Makefile
@@ -37,7 +37,7 @@ ifneq (,$(findstring MINGW32,$(SYSNAME))
HOST_OS = WIN32
TOPDIR := $(shell pwd -W)
else
-ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD OpenBSD))
+ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD OpenBSD DragonFly))
HOST_OS = UNIX
UNIX = bsd
TOPDIR := $(shell pwd)
@@ -48,10 +48,18 @@ UNIX = linux
#UNIX = null
TOPDIR := $(shell pwd)
else
+ifneq (,$(findstring $(SYSNAME),SunOS))
+HOST_OS = UNIX
+# enable this if someone can provide a cd_solaris.c with cdrom stuff
+#UNIX = solaris
+UNIX = null
+TOPDIR := $(shell pwd)
+else
$(error OS type not detected.)
endif
endif
endif
+endif
ifeq ($(TARGET_OS),WIN32)
EXT = .exe
@@ -611,11 +619,11 @@ tyr-glquake.exe: $(patsubst %,$(NQGLDIR)
# Unix
tyr-quake: $(patsubst %,$(NQSWDIR)/%,$(NQ_UNIX_SW_OBJS))
- $(call do_cc_link,$(NQ_UNIX_SW_LFLAGS))
+ $(call do_cc_link,$(NQ_UNIX_SW_LFLAGS)) $(LDFLAGS)
$(call do_strip,$@)
tyr-glquake: $(patsubst %,$(NQGLDIR)/%,$(NQ_UNIX_GL_OBJS))
- $(call do_cc_link,$(NQ_UNIX_GL_LFLAGS))
+ $(call do_cc_link,$(NQ_UNIX_GL_LFLAGS)) $(LDFLAGS)
$(call do_strip,$@)
@@ -860,11 +868,11 @@ tyr-glqwcl.exe: $(patsubst %,$(QWGLDIR)/
# Unix
tyr-qwcl: $(patsubst %,$(QWSWDIR)/%,$(QW_UNIX_SW_OBJS))
- $(call do_cc_link,$(QW_UNIX_SW_LFLAGS))
+ $(call do_cc_link,$(QW_UNIX_SW_LFLAGS)) $(LDFLAGS)
$(call do_strip,$@)
tyr-glqwcl: $(patsubst %,$(QWGLDIR)/%,$(QW_UNIX_GL_OBJS))
- $(call do_cc_link,$(QW_UNIX_GL_LFLAGS))
+ $(call do_cc_link,$(QW_UNIX_GL_LFLAGS)) $(LDFLAGS)
$(call do_strip,$@)
UNUSED_OBJS = cd_audio.o
@@ -946,7 +954,7 @@ tyr-qwsv.exe: $(patsubst %,$(QWSVDIR)/%,
# Unix
tyr-qwsv: $(patsubst %,$(QWSVDIR)/%,$(QWSV_UNIX_OBJS))
- $(call do_cc_link,$(QWSV_UNIX_LFLAGS))
+ $(call do_cc_link,$(QWSV_UNIX_LFLAGS)) $(LDFLAGS)
$(call do_strip,$@)
# ----------------------------------------------------------------------------