From 6357a42e56d7ac3bb043f529b6d0209c5af5ad36 Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Fri, 5 Apr 2002 05:52:39 +0000 Subject: [PATCH] Deuce's mod to use uname to automatically detect FreeBSD build. --- src/sbbs3/GNUmakefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile index 455f579633..126b9290a1 100644 --- a/src/sbbs3/GNUmakefile +++ b/src/sbbs3/GNUmakefile @@ -6,7 +6,7 @@ # @format.tab-size 4, @format.use-tabs true # # # # Linux: gmake # -# FreeBSD: gmake os=freebsd # +# FreeBSD: gmake os=FreeBSD # # # # Optional build targets: dlls, utils, mono, all (default) # ######################################################################### @@ -23,7 +23,12 @@ LD = ld LIBFILE = .a EXEFILE = -ifeq ($(os),freebsd) # FreeBSD +ifndef $(os) +os = $(shell uname) +$(warning OS not specified on command line, setting to '$(os)'.) +endif + +ifeq ($(os),FreeBSD) # FreeBSD LIBODIR := gcc.freebsd.lib EXEODIR := gcc.freebsd.exe else # Linux @@ -35,7 +40,7 @@ DELETE = rm -fv CFLAGS = -DJAVASCRIPT -I../mozilla/js/src -ifeq ($(os),freebsd) # FreeBSD +ifeq ($(os),FreeBSD) # FreeBSD CFLAGS += -D_THREAD_SAFE # Math libraries needed and uses pthread LFLAGS := -lm -pthread @@ -49,7 +54,7 @@ ifdef DEBUG CFLAGS += -g -O0 -D_DEBUG LIBODIR := $(LIBODIR).debug EXEODIR := $(EXEODIR).debug -ifeq ($(os),freebsd) # FreeBSD +ifeq ($(os),FreeBSD) # FreeBSD LIBS += ../mozilla/js/src/FreeBSD4.3-RELEASE_DBG.OBJ/libjs.a else # Linux LIBS += ../mozilla/js/src/Linux_All_DBG.OBJ/libjs.a @@ -57,7 +62,7 @@ endif else # RELEASE LIBODIR := $(LIBODIR).release EXEODIR := $(EXEODIR).release -ifeq ($(os),freebsd) # FreeBSD +ifeq ($(os),FreeBSD) # FreeBSD LIBS += ../mozilla/js/src/FreeBSD4.3-RELEASE_OPT.OBJ/libjs.a else LIBS += ../mozilla/js/src/Linux_All_OPT.OBJ/libjs.a -- GitLab