v2.3.0

CursedHardware · Dec 24, 2021 · f7208b7 · f7208b7
1 parent ed5e18d
commit f7208b7
Show file tree

Hide file tree

Showing 73 changed files with 2,053 additions and 414 deletions.
diff --git a/Jambase b/Jambase
@@ -430,13 +430,15 @@ if $(NT)
 			MINGW64_LIB32 = $(MINGW)/mingw/lib32 ;
 		} else {
 			ECHO "Compiler is MingW for 32 bit target" ;
+			TPFX1        = "" ;	# Some tools
+			TPFX2        = "" ;	# Rest of tools
 		}
 
-
 		# Basic C/C++ tools
 		AR				?= $(TPFX2)ar rusc ;
 		AS				?= $(TPFX2)as ;
 		CC				?= $(TPFX1)gcc ;
+echo "CC = " $(CC) ;
 		CCFLAGS			?= -DNT -mwin32 -pipe ;
 		C++				?= $(CC) ;
 		C++FLAGS		?= $(CCFLAGS) ;
@@ -2072,19 +2074,19 @@ rule _JamInclude
 
 	if $(_JAMINCLUDE_PEER) != "true" {
 		# Incorporate this levels extra flags & header paths into the base 
-		P_ASFLAGS += $(ASFLAGS) ;
-		P_CCFLAGS += $(CCFLAGS) ;
-		P_C++FLAGS += $(C++FLAGS) ;
-		P_LINKFLAGS += $(LINKFLAGS) ;
-		P_SHLINKFLAGS += $(SHLINKFLAGS) ;
-		P_HDRS = [ NormPaths $(HDRS) ] $(P_HDRS) ;
-		P_DEFINES += $(DEFINES) ;
-		P_LINKOBJS = [ NormPaths $(LINKOBJS) ] $(P_LINKOBJS) ;
-		P_LINKLIBS = [ NormPaths $(LINKLIBS) ] $(P_LINKLIBS) ;
-		P_LINKSHLIBS = [ NormPaths $(LINKSHLIBS) ] $(P_LINKSHLIBS) ;
-		P_SHLINKOBJS = [ NormPaths $(SHLINKOBJS) ] $(P_SHLINKOBJS) ;
-		P_SHLINKLIBS = [ NormPaths $(SHLINKLIBS) ] $(P_SHLINKLIBS) ;
-		P_SHLINKSHLIBS = [ NormPaths $(SHLINKSHLIBS) ] $(P_SHLINKSHLIBS) ;
+		P_ASFLAGS += $(ASFLAGS) ;	ASFLAGS = "" ;
+		P_CCFLAGS += $(CCFLAGS) ;	CCFLAGS = "" ;
+		P_C++FLAGS += $(C++FLAGS) ;		C++FLAGS = "" ;
+		P_LINKFLAGS += $(LINKFLAGS) ;	LINKFLAGS = "" ;
+		P_SHLINKFLAGS += $(SHLINKFLAGS) ;	SHLINKFLAGS = "" ;
+		P_HDRS = [ NormPaths $(HDRS) ] $(P_HDRS) ;	HDRS = "" ;
+		P_DEFINES += $(DEFINES) ;	DEFINES = "" ;
+		P_LINKOBJS = [ NormPaths $(LINKOBJS) ] $(P_LINKOBJS) ; LINKOBJS = "" ;
+		P_LINKLIBS = [ NormPaths $(LINKLIBS) ] $(P_LINKLIBS) ;	LINKLIBS = "" ;
+		P_LINKSHLIBS = [ NormPaths $(LINKSHLIBS) ] $(P_LINKSHLIBS) ;	LINKSHLIBS = "" ;
+		P_SHLINKOBJS = [ NormPaths $(SHLINKOBJS) ] $(P_SHLINKOBJS) ;	SHLINKOBJS = "" ;
+		P_SHLINKLIBS = [ NormPaths $(SHLINKLIBS) ] $(P_SHLINKLIBS) ;	SHLINKLIBS = "" ;
+		P_SHLINKSHLIBS = [ NormPaths $(SHLINKSHLIBS) ] $(P_SHLINKSHLIBS) ;	SHLINKSHLIBS = "" ;
 
 		# Set parent flags no existing parent flags
 		if ! $(P_PREF_ASFLAGS) {
@@ -3383,6 +3385,7 @@ rule MainFromObjects
 
 #Echo "MainFromObjects LINKFLAGS = '" $(LINKFLAGS) "' and P_LINKFLAGS ='" $(P_LINKFLAGS) "'" ;
 #Echo "                PREF_LINKFLAGS = '" $(PREF_LINKFLAGS) "' and P_PREF_LINKFLAGS ='" $(P_PREF_LINKFLAGS) "'" ;
+#Echo "                pref_linkflags = '" $(pref_linkflags) "'" ;
 	if $(LINKFLAGS) || $(P_LINKFLAGS)
 	 || $(PREF_LINKFLAGS) || $(P_PREF_LINKFLAGS) {
 		local pref_linkflags = $(P_PREF_LINKFLAGS) ;
@@ -3643,6 +3646,8 @@ rule Object
 	switch $(_s:S)
 	{
 		case .asm : As_ $(_t) : $(_s) ;
+		case .s :	As_ $(_t) : $(_s) ;
+		case .S :	As_ $(_t) : $(_s) ;
 
 		case .c :	Cc_ $(_t) : $(_s) ;
 
@@ -3662,8 +3667,6 @@ rule Object
 						Cc_ $(_t) : $(_c) ;
 					}
 
-		case .s :	As_ $(_t) : $(_s) ;
-
 		case .y :	{
 						local _c = $(_t:S=$(YACCGEN)) ;
 						CopyTarget $(_c) : $(_t) ;	# Transfer LOCATE, SEARCH, NOMLOC
@@ -4140,7 +4143,7 @@ actions together ArchiveArchive
 	rm -rf .jamArchiveArchive$PPID
 }
 
-actions As
+actions As_
 {
 	$(AS) $(ASFLAGS) $(ASHDRS) -o $(<) $(>)
 }

diff --git a/Jamtop b/Jamtop
@@ -46,7 +46,7 @@ USE_VTPGLUT = false ;
 USE_PRINTER = false ;
 
 # enable CMF Measurement device and accessory support (if present)
-USE_CMFM = false ;	
+USE_CMFM = true ;	
 
 # Use ArgyllCMS version of libusb (deprecated - don't use)
 USE_LIBUSB = false ;	# [false]

diff --git a/Readme.txt b/Readme.txt
@@ -1,8 +1,8 @@
 
-Argyll CMS README file - Version 2.2.1
+Argyll CMS README file - Version 2.3.0
 --------------------------------------
 
-Date: 17th September 2021
+Date: 24th December 2021
 Author: Graeme Gill
 
 Introduction
@@ -26,7 +26,7 @@ provided for each major tool, and a general guide to using the tools for
 typical color management tasks is also available. A mailing list provides
 support for more advanced usage.
 
-This is Version 2.2.1, a bug fix update to the last release V2.2.0.
+This is Version 2.3.0, a bug fix and feature change update to the last release V2.2.1.
 The first public release of icclib was in November 1998,
 and of Argyll was in October 2000. Code development commenced in 1995. See
 Changes Summary for an overview of changes since the last release. Changes