CHANGE: merged macOS and Windows OS codecs registrations

Author: Oldes

make/rebol3.nest

@@ -258,7 +258,7 @@ mezz-lib-files: [
 ;	%mezz/codec-html-entities.reb
 ;	%mezz/codec-wav.reb
 ;	%mezz/codec-swf.reb
-;	%mezz/codec-image.reb ; included using: include-image-os-codec (windows only so far)
+;	%mezz/codec-image.reb ; included using: include-image-os-codec (windows and macos only so far)
 ;	%mezz/codec-image-ext.reb ; image codec extensions (codecs/png/size?)
 ]
 mezz-prot-files: [
@@ -329,20 +329,18 @@ include-native-gif-codec: [config: INCLUDE_GIF_CODEC core-files: %core/u-gif.c]
 
 ;@@ on Windows it's better to use system image codec (ability to use more types)
 include-image-os-codec: [
+	config: INCLUDE_IMAGE_OS_CODEC
+	mezz-lib-files: %mezz/codec-image.reb
 	#if Windows? [
-		config: INCLUDE_IMAGE_OS_CODEC
 		host-files: %os/win32/host-image.c
-		mezz-lib-files: %mezz/codec-image-win.reb
 	]
 	#if MacOS? [
-		config: INCLUDE_IMAGE_OS_CODEC
 		host-files: [
 			%os/osx/host-image.c
 			%os/osx/sys-codecs.m
 			%os/osx/sys-utils.m
 		]
 		frameworks: [CoreGraphics CoreImage ImageIO Foundation]
-		mezz-lib-files: %mezz/codec-image-osx.reb
 	]
 ]
 
@@ -495,7 +493,7 @@ include-codec-bbcode:        [mezz-lib-files:  %mezz/codec-bbcode.reb       ]
 include-codec-html-entities: [mezz-lib-files:  %mezz/codec-html-entities.reb]
 include-codec-ico: [
 	; at this moment ico can be encoded only from pngs!
-	:include-native-png-codec 
+	;:include-native-png-codec 
 	mezz-lib-files: %mezz/codec-ico.reb
 	mezz-lib-files: %mezz/codec-image-ext.reb ; png/size? function
 ]
@@ -538,10 +536,11 @@ include-rebol-core: [
 	:include-iconv
 	:include-https
 
+	:include-codec-unixtime
 	:include-codec-gzip
 	:include-codec-zip
 	:include-codec-tar
-	:include-codec-unixtime
+	
 	config: INCLUDE_SHA224
 	config: INCLUDE_SHA384
 
@@ -551,23 +550,24 @@ include-rebol-core: [
 include-rebol-bulk: [
 	:include-rebol-core
 	:include-optional-checksums
-	:include-image-codecs
 	:include-image-natives
 	:include-lzma-compression
 	:include-base85-encoding
 	:include-view
 	:include-midi
 
+	:include-codec-swf
 	:include-codec-gzip
 	:include-codec-zip
 	:include-codec-tar
 	:include-codec-bbcode
-	:include-codec-html-entities
-	:include-codec-ico
+	:include-codec-html-entities	
 	:include-codec-json
 	:include-codec-xml
-	:include-codec-swf
 	:include-codec-wav
+	:include-codec-ico
+
+	:include-image-codecs
 
 	:include-mezz-date
 	:include-mezz-colors