Update to MAC 5.54

2 files changed, 83 insertions, 104 deletions

diff --git a/mac/mac-sdk-5.44-gcc.patch b/mac/mac-sdk-5.54-gcc.patch
index 7e08175..447032d 100644
--- a/mac/mac-sdk-5.44-gcc.patch
+++ b/mac/mac-sdk-5.54-gcc.patch
@@ -1,6 +1,6 @@
-diff -Naur mac-sdk-5.44/Makefile mac-sdk-5.44-gcc/Makefile
---- mac-sdk-5.44/Makefile	1970-01-01 00:00:00 +0000
-+++ mac-sdk-5.44-gcc/Makefile	2019-11-21 21:28:57 +0000
+diff -Naur mac-sdk-5.54/Makefile mac-sdk-5.54-gcc/Makefile
+--- mac-sdk-5.54/Makefile	1970-01-01 00:00:00 +0000
++++ mac-sdk-5.54-gcc/Makefile	2019-11-21 21:28:57 +0000
 @@ -0,0 +1,8 @@
 +all:
 +	$(MAKE) -f Source/Projects/NonWindows/Makefile
@@ -10,10 +10,10 @@ diff -Naur mac-sdk-5.44/Makefile mac-sdk-5.44-gcc/Makefile
 +
 +clean:
 +	$(MAKE) -f Source/Projects/NonWindows/Makefile clean
-diff -Naur mac-sdk-5.44/Shared/All.h mac-sdk-5.44-gcc/Shared/All.h
---- mac-sdk-5.44/Shared/All.h	2020-04-24 13:08:43 +0000
-+++ mac-sdk-5.44-gcc/Shared/All.h	2020-05-04 13:10:52 +0000
-@@ -117,46 +117,17 @@
+diff -Naur mac-sdk-5.54/Shared/All.h mac-sdk-5.54-gcc/Shared/All.h
+--- mac-sdk-5.54/Shared/All.h	2020-07-27 17:01:34 +0000
++++ mac-sdk-5.54-gcc/Shared/All.h	2020-08-29 18:26:57 +0000
+@@ -121,46 +121,17 @@
  #define ENABLE_COMPRESSION_MODE_HIGH

  #define ENABLE_COMPRESSION_MODE_EXTRA_HIGH

  

@@ -62,7 +62,7 @@ diff -Naur mac-sdk-5.44/Shared/All.h mac-sdk-5.44-gcc/Shared/All.h
  

      typedef uint64_t                                    uint64;

      typedef uint32_t                                    uint32;

-@@ -210,10 +181,14 @@
+@@ -219,12 +190,21 @@
      #define TICK_COUNT_FREQ                             1000000

      #undef    ASSERT

      #define ASSERT(e)

@@ -76,79 +76,40 @@ diff -Naur mac-sdk-5.44/Shared/All.h mac-sdk-5.44-gcc/Shared/All.h
 +    #define sprintf_s(A, B, C, ...) sprintf(A, C, __VA_ARGS__)

 +    #define _stprintf_s(A, B, C, ...) _stprintf(A, C, __VA_ARGS__)

      #define strcpy_s(A, B, C) strcpy(A, C)

-     #define _tcscat_s(A, B, C) _tcscat(A, C)

+-    #define _tcscat_s(A, B, C) _tcscat(A, C)

++

++    #if defined(PLATFORM_WINDOWS)

++        #define _tcsncpy_s(A, B, C, COUNT) _tcsncpy(A, C, COUNT)

++        #define _tcscpy_s(A, B, C) _tcscpy(A, C)

++        #define _tcscat_s(A, B, C) _tcscat(A, C)

++    #endif

  #endif

-diff -Naur mac-sdk-5.44/Shared/NoWindows.h mac-sdk-5.44-gcc/Shared/NoWindows.h
---- mac-sdk-5.44/Shared/NoWindows.h	2020-06-18 15:34:55 +0000
-+++ mac-sdk-5.44-gcc/Shared/NoWindows.h	2020-06-19 17:01:26 +0000
-@@ -48,7 +48,7 @@
+ 

+ /*****************************************************************************************

+diff -Naur mac-sdk-5.54/Shared/NoWindows.h mac-sdk-5.54-gcc/Shared/NoWindows.h
+--- mac-sdk-5.54/Shared/NoWindows.h	2020-07-21 19:27:20 +0000
++++ mac-sdk-5.54-gcc/Shared/NoWindows.h	2020-08-29 18:25:57 +0000
+@@ -46,7 +46,7 @@
+ 

+ #define _strnicmp strncasecmp

+ #define _wtoi(x) wcstol(x, NULL, 10)

+-#define _tcscat wcscat

++#define _tcscat_s wcscat_s

+ #undef _totlower

  #define _totlower towlower

  #define _totupper towupper

- #define _tcschr wcschr

+@@ -54,7 +54,7 @@
+ #ifdef _MSC_VER

+ #define _tcsicmp _wcsicmp

+ #else

 -#define _tcsicmp wcscasecmp

 +#define _tcsicmp wcscmp

+ #endif

  #define _tcscpy wcscpy

  #define _tcslen wcslen

- #define _tcsncpy wcsncpy

-diff -Naur mac-sdk-5.44/Source/Console/Console.cpp mac-sdk-5.44-gcc/Source/Console/Console.cpp
---- mac-sdk-5.44/Source/Console/Console.cpp	2020-06-18 15:33:19 +0000
-+++ mac-sdk-5.44-gcc/Source/Console/Console.cpp	2020-06-19 17:35:08 +0000
-@@ -23,17 +23,27 @@
- #define UNDEFINED_MODE        -1

- 

- // use 8 bit character functions on non-Windows platforms

--#ifndef PLATFORM_WINDOWS

-+#ifdef PLATFORM_WINDOWS

-+    #ifndef _MSC_VER

-+        #define _tcscpy_s(dst, num, src) wcscpy(dst, src)

-+        #define _tcsncpy_s(dst, num, src, count) wcsncpy(dst, src, count)

-+    #endif

-+#else

-     #define _tmain(argc, argv) main(argc, argv)

-+    #define _tcscpy(dst, src) strcpy(dst, src)

-     #define _tcscpy_s(dst, num, src) strcpy(dst, src)

-+    #define _tcsncpy(dst, src, count) strncpy(dst, src, count)

-     #define _tcsncpy_s(dst, num, src, count) strncpy(dst, src, count)

-     #define _tcsnicmp(str1, str2, count) strncasecmp(str1, str2, count)

-+    #define _tcslen(str) strlen(str)

-+    #define _tcsstr(str1, str2) strstr(str1, str2)

-     #define _ftprintf fprintf

-     #define _ttoi(str) atoi(str)

-     #ifdef _T

-       #undef _T

-     #endif

-     #define TCHAR char

-+    #define LPCTSTR const char *

-     #define _T(x) x

- #endif

- 

-@@ -347,7 +357,22 @@
-                     TCHAR cRight[256];

-                     _tcscpy(cRight, &pEqual[1]);

- 

--                    pTag->SetFieldString(cLeft, cRight);

-+                    CSmartPtr<wchar_t> spLeft; CSmartPtr<wchar_t> spRight;

-+

-+                    #ifdef PLATFORM_WINDOWS

-+                        #ifdef _UNICODE

-+                            spLeft.Assign(cLeft, TRUE, FALSE);

-+                            spRight.Assign(cRight, TRUE, FALSE);

-+                        #else

-+                            spLeft.Assign(CAPECharacterHelper::GetUTF16FromANSI(cLeft), TRUE);

-+                            spRight.Assign(CAPECharacterHelper::GetUTF16FromANSI(cRight), TRUE);

-+                        #endif

-+                    #else

-+                        spLeft.Assign(CAPECharacterHelper::GetUTF16FromUTF8((str_utf8*) cLeft), TRUE);

-+                        spRight.Assign(CAPECharacterHelper::GetUTF16FromUTF8((str_utf8*) cRight), TRUE);

-+                    #endif

-+

-+                    pTag->SetFieldString(spLeft, spRight);

-                 }

- 

-                 delete [] pParameter;

-diff -Naur mac-sdk-5.44/Source/MACLib/APEInfo.cpp mac-sdk-5.44-gcc/Source/MACLib/APEInfo.cpp
---- mac-sdk-5.44/Source/MACLib/APEInfo.cpp	2020-04-13 22:37:20 +0000
-+++ mac-sdk-5.44-gcc/Source/MACLib/APEInfo.cpp	2020-05-04 13:15:05 +0000
+diff -Naur mac-sdk-5.54/Source/MACLib/APEInfo.cpp mac-sdk-5.54-gcc/Source/MACLib/APEInfo.cpp
+--- mac-sdk-5.54/Source/MACLib/APEInfo.cpp	2020-04-13 22:37:20 +0000
++++ mac-sdk-5.54-gcc/Source/MACLib/APEInfo.cpp	2020-08-29 17:53:56 +0000
 @@ -15,7 +15,7 @@
  /*****************************************************************************************

  Construction

@@ -167,9 +128,9 @@ diff -Naur mac-sdk-5.44/Source/MACLib/APEInfo.cpp mac-sdk-5.44-gcc/Source/MACLib
      {

          CloseFile();

          *pErrorCode = ERROR_INVALID_INPUT_FILE;

-diff -Naur mac-sdk-5.44/Source/MACLib/APEInfo.h mac-sdk-5.44-gcc/Source/MACLib/APEInfo.h
---- mac-sdk-5.44/Source/MACLib/APEInfo.h	2020-06-09 18:21:40 +0000
-+++ mac-sdk-5.44-gcc/Source/MACLib/APEInfo.h	2020-06-13 16:06:24 +0000
+diff -Naur mac-sdk-5.54/Source/MACLib/APEInfo.h mac-sdk-5.54-gcc/Source/MACLib/APEInfo.h
+--- mac-sdk-5.54/Source/MACLib/APEInfo.h	2020-06-09 18:21:40 +0000
++++ mac-sdk-5.54-gcc/Source/MACLib/APEInfo.h	2020-08-29 17:48:07 +0000
 @@ -75,7 +75,7 @@
  public:

      

@@ -179,9 +140,9 @@ diff -Naur mac-sdk-5.44/Source/MACLib/APEInfo.h mac-sdk-5.44-gcc/Source/MACLib/A
      CAPEInfo(int * pErrorCode, APE::CIO * pIO, CAPETag * pTag = NULL);

      virtual ~CAPEInfo();

  

-diff -Naur mac-sdk-5.44/Source/MACLib/MACLib.cpp mac-sdk-5.44-gcc/Source/MACLib/MACLib.cpp
---- mac-sdk-5.44/Source/MACLib/MACLib.cpp	2020-04-24 13:17:55 +0000
-+++ mac-sdk-5.44-gcc/Source/MACLib/MACLib.cpp	2020-05-04 13:13:59 +0000
+diff -Naur mac-sdk-5.54/Source/MACLib/MACLib.cpp mac-sdk-5.54-gcc/Source/MACLib/MACLib.cpp
+--- mac-sdk-5.54/Source/MACLib/MACLib.cpp	2020-06-29 18:37:41 +0000
++++ mac-sdk-5.54-gcc/Source/MACLib/MACLib.cpp	2020-08-29 17:47:30 +0000
 @@ -94,7 +94,7 @@
      else if (StringIsEqual(pExtension, L".mac", false) || StringIsEqual(pExtension, L".ape", false))

      {

@@ -191,9 +152,9 @@ diff -Naur mac-sdk-5.44/Source/MACLib/MACLib.cpp mac-sdk-5.44-gcc/Source/MACLib/
      }

  

      // fail if we couldn't get the file information

-diff -Naur mac-sdk-5.44/Source/Projects/NonWindows/Makefile mac-sdk-5.44-gcc/Source/Projects/NonWindows/Makefile
---- mac-sdk-5.44/Source/Projects/NonWindows/Makefile	2020-04-24 21:09:10 +0000
-+++ mac-sdk-5.44-gcc/Source/Projects/NonWindows/Makefile	2020-06-18 19:16:27 +0000
+diff -Naur mac-sdk-5.54/Source/Projects/NonWindows/Makefile mac-sdk-5.54-gcc/Source/Projects/NonWindows/Makefile
+--- mac-sdk-5.54/Source/Projects/NonWindows/Makefile	2020-04-24 21:09:10 +0000
++++ mac-sdk-5.54-gcc/Source/Projects/NonWindows/Makefile	2020-08-29 17:45:44 +0000
 @@ -85,7 +85,7 @@
  	$(CC) $(SHAREDOBJECTS) $(LIBOBJECTS) $(DLLOBJECTS) $(LDOPTS) $(LDFLAGS) $(DLLLDOPTS) -o $@
  
@@ -203,10 +164,10 @@ diff -Naur mac-sdk-5.44/Source/Projects/NonWindows/Makefile mac-sdk-5.44-gcc/Sou
  
  Source/Shared/%.o: Source/Shared/%.cpp
  	$(CXX) $(CXXOPTS) $(CXXFLAGS) $< -o $@
-diff -Naur mac-sdk-5.44/Source/Shared/All.h mac-sdk-5.44-gcc/Source/Shared/All.h
---- mac-sdk-5.44/Source/Shared/All.h	2020-04-24 13:08:43 +0000
-+++ mac-sdk-5.44-gcc/Source/Shared/All.h	2020-05-04 13:10:52 +0000
-@@ -117,46 +117,17 @@
+diff -Naur mac-sdk-5.54/Source/Shared/All.h mac-sdk-5.54-gcc/Source/Shared/All.h
+--- mac-sdk-5.54/Source/Shared/All.h	2020-07-27 17:01:34 +0000
++++ mac-sdk-5.54-gcc/Source/Shared/All.h	2020-08-29 18:26:57 +0000
+@@ -121,46 +121,17 @@
  #define ENABLE_COMPRESSION_MODE_HIGH

  #define ENABLE_COMPRESSION_MODE_EXTRA_HIGH

  

@@ -255,7 +216,7 @@ diff -Naur mac-sdk-5.44/Source/Shared/All.h mac-sdk-5.44-gcc/Source/Shared/All.h
  

      typedef uint64_t                                    uint64;

      typedef uint32_t                                    uint32;

-@@ -210,10 +181,14 @@
+@@ -219,12 +190,21 @@
      #define TICK_COUNT_FREQ                             1000000

      #undef    ASSERT

      #define ASSERT(e)

@@ -269,22 +230,39 @@ diff -Naur mac-sdk-5.44/Source/Shared/All.h mac-sdk-5.44-gcc/Source/Shared/All.h
 +    #define sprintf_s(A, B, C, ...) sprintf(A, C, __VA_ARGS__)

 +    #define _stprintf_s(A, B, C, ...) _stprintf(A, C, __VA_ARGS__)

      #define strcpy_s(A, B, C) strcpy(A, C)

-     #define _tcscat_s(A, B, C) _tcscat(A, C)

+-    #define _tcscat_s(A, B, C) _tcscat(A, C)

++

++    #if defined(PLATFORM_WINDOWS)

++        #define _tcsncpy_s(A, B, C, COUNT) _tcsncpy(A, C, COUNT)

++        #define _tcscpy_s(A, B, C) _tcscpy(A, C)

++        #define _tcscat_s(A, B, C) _tcscat(A, C)

++    #endif

  #endif

-diff -Naur mac-sdk-5.44/Source/Shared/NoWindows.h mac-sdk-5.44-gcc/Source/Shared/NoWindows.h
---- mac-sdk-5.44/Source/Shared/NoWindows.h	2020-06-18 15:34:55 +0000
-+++ mac-sdk-5.44-gcc/Source/Shared/NoWindows.h	2020-06-19 17:01:26 +0000
-@@ -48,7 +48,7 @@
+ 

+ /*****************************************************************************************

+diff -Naur mac-sdk-5.54/Source/Shared/NoWindows.h mac-sdk-5.54-gcc/Source/Shared/NoWindows.h
+--- mac-sdk-5.54/Source/Shared/NoWindows.h	2020-07-21 19:27:20 +0000
++++ mac-sdk-5.54-gcc/Source/Shared/NoWindows.h	2020-08-29 18:25:57 +0000
+@@ -46,7 +46,7 @@
+ 

+ #define _strnicmp strncasecmp

+ #define _wtoi(x) wcstol(x, NULL, 10)

+-#define _tcscat wcscat

++#define _tcscat_s wcscat_s

+ #undef _totlower

  #define _totlower towlower

  #define _totupper towupper

- #define _tcschr wcschr

+@@ -54,7 +54,7 @@
+ #ifdef _MSC_VER

+ #define _tcsicmp _wcsicmp

+ #else

 -#define _tcsicmp wcscasecmp

 +#define _tcsicmp wcscmp

+ #endif

  #define _tcscpy wcscpy

  #define _tcslen wcslen

- #define _tcsncpy wcsncpy

-diff -Naur mac-sdk-5.44/configure mac-sdk-5.44-gcc/configure
---- mac-sdk-5.44/configure	1970-01-01 00:00:00 +0000
-+++ mac-sdk-5.44-gcc/configure	2019-11-21 21:28:57 +0000
+diff -Naur mac-sdk-5.54/configure mac-sdk-5.54-gcc/configure
+--- mac-sdk-5.54/configure	1970-01-01 00:00:00 +0000
++++ mac-sdk-5.54-gcc/configure	2019-11-21 21:28:57 +0000
 @@ -0,0 +1 @@
 +#!/bin/sh
diff --git a/mac/mac.json b/mac/mac.json
index 1561102..c016215 100644
--- a/mac/mac.json
+++ b/mac/mac.json
@@ -1,8 +1,9 @@
 {
   "name": "libmac",
-  "buildsystem": "simple",
-  "build-commands": [
-    "make -f Source/Projects/NonWindows/Makefile prefix=/app all install"
+  "no-autogen": true,
+  "rm-configure": true,
+  "make-install-args": [
+    "prefix=/app"
   ],
   "cleanup": [
     "/bin/mac"
@@ -10,13 +11,13 @@
   "sources": [
     {
         "type": "archive",
-        "url": "https://freac.org/patches/MAC_SDK_544.zip",
-        "sha256": "d5d2c2de4f64c61bc98c59a8691e47a6e2bb1beb3a3ae50d98bb0fdfdb91e480",
+        "url": "https://freac.org/patches/MAC_SDK_554.zip",
+        "sha256": "931f744641cfeb5f173d2bb27df750e285c2e3c236e1ef0ac6c1ab75281550a3",
         "strip-components": 0
     },
     {
         "type": "patch",
-        "path": "mac-sdk-5.44-gcc.patch"
+        "path": "mac-sdk-5.54-gcc.patch"
     }
   ]
 }