⛏️ index : buildtools.git

author Augustin Cavalier <waddlesplash@gmail.com> 2018-11-21 14:55:45.0 -05:00:00
committer Augustin Cavalier <waddlesplash@gmail.com> 2018-11-21 14:57:36.0 -05:00:00
commit
4d114c95a7674c33e335a9fe5387727c99fc8dc8 [patch]
tree
43298511ec8ee0d7d9731c1820e0d0306a11f1cd
parent
531869677c2bbc5e1fad81988f789d61743bcb7f
download
4d114c95a7674c33e335a9fe5387727c99fc8dc8.tar.gz

Jambase: Remove Mac OS 9 support.

macOS support is provided via the "MACOSX" case under "UNIX"
and is unaffected by this.

Also remove the Win98 (!) cruft while we're at it.

Diff

 jam/Jambase | 94 +-------------------------------------------------------------------------------
 1 file changed, 1 insertion(+), 93 deletions(-)

diff --git a/jam/Jambase b/jam/Jambase
index bf5ded4..88f8067 100644
--- a/jam/Jambase
+++ a/jam/Jambase
@@ -118,7 +118,7 @@
# Special variables set by jam:
#	$(<) - targets of a rule (to the left of the :)
#	$(>) - sources of a rule (to the right of the :)
#	$(xxx) - true on xxx (UNIX, NT, MAC)
#	$(xxx) - true on xxx (UNIX, NT)
#	$(OS) - name of OS - varies wildly
#	$(JAMVERSION) - version number (2.5)
#
@@ -200,62 +200,11 @@
	}

} else if $(MINGW) {
	Echo		"MingW32" ;

	CC		?= gcc ;
	C++		?= g++ ;
	CCFLAGS 	+= -DMINGW ;
	RANLIB		?= "ranlib" ;
	SUFEXE		?= .exe ;
} else if $(MAC) {
	local OPT ;

	CW	?= "{CW}" ;

	MACHDRS ?=
		"$(UMACHDRS):Universal:Interfaces:CIncludes"
		"$(CW):MSL:MSL_C:MSL_Common:Include"
		"$(CW):MSL:MSL_C:MSL_MacOS:Include" ;

	MACLIBS ?=
		"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Interfacelib"
		"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Mathlib" ;

	MPWLIBS ?=
		"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib"
		"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW.Lib" ;

	MPWNLLIBS ?=
		"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib"
		"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW(NL).Lib" ;

	SIOUXHDRS ?= ;

	SIOUXLIBS ?=
		"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_Runtime_PPC.lib"
		"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_SIOUX_PPC.Lib"
		"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib" ;

	C++		?= mwcppc ;
	C++FLAGS	?= -w off ;
	CC		?= mwcppc ;
	CCFLAGS		?= -w off ;
	CP		?= duplicate -y ;
	DOT		?= ":" ;
	DOTDOT		?= "::" ;
	HDRS 		?= $(MACHDRS) $(MPWHDRS) ;
	LINK		?= mwlinkppc ;
	LINKFLAGS	?= -mpwtool -warn ;
	LINKLIBS 	?= $(MACLIBS) $(MPWLIBS) ;
	MKDIR		?= newfolder ;
	MV		?= rename -y ;
	NOARSCAN	?= true ;
	OPTIM		?= ;
	RM		?= delete -y ;
	SLASH		?= ":" ;
	STDHDRS		?= ;
	SUFLIB		?= .lib ;
	SUFOBJ		?= .o ;
} else if $(OS) = BEOS && $(OSPLAT) = PPC {
	AR		?= mwld -xml -o ;
	BINDIR		?= /boot/home/config/bin ;
@@ -1550,10 +1499,6 @@
if $(NT) {
	rule FDefines { return /D$(<) ; }
	rule FIncludes { return /I$(<) ; }
} else if $(MAC) {
	rule FQuote { return \"$(<)\" ; }
	rule FDefines { return "-define '$(<)'" ; }
	rule FIncludes { return \"$(<:J=,)\" ; }
}

#
@@ -1758,43 +1703,6 @@
	actions Link bind NEEDLIBS
	{
	$(LINK) $(LINKFLAGS) /out:$(<) $(UNDEFS) $(>) $(NEEDLIBS) $(LINKLIBS)
	}
}

#
# Mac specifc actions
#

else if $(MAC)
{
	actions together Archive
	{
	$(LINK) -library -o $(<) $(>)
	}

	actions Cc
	{
	set -e MWCincludes $(CCHDRS)
	$(CC) -o $(<) $(CCFLAGS) $(CCDEFS) $(>)
	}

	actions C++
	{
	set -e MWCincludes $(CCHDRS)
	$(CC) -o $(<) $(C++FLAGS) $(CCDEFS) $(>)
	}

	actions Link bind NEEDLIBS
	{
	$(LINK) -o $(<) $(LINKFLAGS) $(>) $(NEEDLIBS) "$(LINKLIBS)"
	}
}

if $(WIN98)
{
	actions existing Clean
	{
	del $(>)
	}
}