Fixing build-macos.yml

bjasspa · Jul 30, 2024 · 92bc41b · 92bc41b
1 parent fef832f
commit 92bc41b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/.github/workflows/build-linux5.yml b/.github/workflows/build-linux5.yml
@@ -28,13 +28,13 @@ jobs:
       run: |
         cd ./microemacs/src
         ./build.sh -t w
-    - name: Create linux5 bin download
+    - name: Create linux5 binaries download
       run: |
         cd ./microemacs/bin
         mv linux5-intel64-gcc9 linux5-intel64
         cd ..
         export MEVER=`./bin/linux5-intel64/mec -p @contribs/ver.emf`
-        zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_linux5_bin bin
+        zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_linux5_binaries bin
 
     - name: Create linux5 mecs
       run: |

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -29,6 +29,14 @@ jobs:
       run: |
         cd ./microemacs/src
         ./build.sh -t w -a apple
+    - name: Create macos apple binaries download
+      run: |
+        cd ./microemacs/bin
+        mv macos23-apple64-* macos23-apple64
+        cd ..
+        export MEVER=`./bin/macos23-apple64/mec -p @contribs/ver.emf`
+        zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_macos23_apple64_binaries bin
+
     - name: Compile macos intel mec
       run: |
         cd ./microemacs/src
@@ -37,4 +45,11 @@ jobs:
       run: |
         cd ./microemacs/src
         ./build.sh -t w -a intel
+    - name: Create macos apple binaries download
+      run: |
+        cd ./microemacs/bin
+        mv macos23-intel64-* macos23-intel64
+        cd ..
+        export MEVER=`./bin/macos23-apple64/mec -p @contribs/ver.emf`
+        zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_macos23_intel64_binaries bin/macos23-intel64
            
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -59,7 +59,7 @@ jobs:
         Rename-Item -Path windows100-intel32-msvc17 -NewName windows100-intel32
         cd ..
         $env:MEVER=$(.\bin\windows100-intel32\mec -p @contribs/ver.emf)
-        Compress-Archive -Path bin -DestinationPath ..\downloads\Jasspa_MicroEmacs_${env:MEVER}_windows100_bin
+        Compress-Archive -Path bin -DestinationPath ..\downloads\Jasspa_MicroEmacs_${env:MEVER}_windows100_binaries
 
     - name: Create windows100 openssl download
       shell: pwsh

diff --git a/microemacs/3rdparty/tfs/macoscc.mak b/microemacs/3rdparty/tfs/macoscc.mak
@@ -30,6 +30,11 @@ ARCHITEC = intel
 else
 ARCHITEC = apple
 endif
+ifeq "$(ARCHITEC)" "intel"
+ARCFLAGS = -arch x86_64
+else
+ARCFLAGS = -arch arm64
+endif
 ifeq "$(BIT_SIZE)" ""
 BIT_SIZE = $(shell getconf LONG_BIT)
 endif
@@ -47,10 +52,10 @@ OUTDIRR  = .$(BUILDID)-release
 OUTDIRD  = .$(BUILDID)-debug
 TRDPARTY = ..
 
-CCDEFS   = -m$(BIT_SIZE) -D_MACOS -D_$(BIT_SIZE)BIT -Wall -I$(TRDPARTY)/zlib
+CCDEFS   = -m$(BIT_SIZE) $(ARCFLAGS) -D_MACOS -D_$(BIT_SIZE)BIT -Wall -I$(TRDPARTY)/zlib
 CCFLAGSR = -O3 -flto -DNDEBUG=1 -Wno-uninitialized
 CCFLAGSD = -g
-LDDEFS   = -m$(BIT_SIZE)
+LDDEFS   = -m$(BIT_SIZE) $(ARCFLAGS)
 LDFLAGSR = -O3 -flto
 LDFLAGSD = -g
 ARFLAGSR = rcs
@@ -116,7 +121,7 @@ $(OUTDIR)/$(PRGFILE): $(OUTDIR) $(INSTDIR) $(PRGOBJS) $(PRGLIBS)
 $(PRGOBJS): $(PRGHDRS)
 
 $(TRDPARTY)/zlib/$(OUTDIR)/zlib$(A):
-	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak BCFG=$(BCFG)
+	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG)
 
 $(OUTDIR):
 	-mkdir $(OUTDIR)

diff --git a/microemacs/3rdparty/zlib/macoscc.mak b/microemacs/3rdparty/zlib/macoscc.mak
@@ -30,6 +30,11 @@ ARCHITEC = intel
 else
 ARCHITEC = apple
 endif
+ifeq "$(ARCHITEC)" "intel"
+ARCFLAGS = -arch x86_64
+else
+ARCFLAGS = -arch arm64
+endif
 ifeq "$(BIT_SIZE)" ""
 BIT_SIZE = $(shell getconf LONG_BIT)
 endif
@@ -47,10 +52,10 @@ OUTDIRR  = .$(BUILDID)-release
 OUTDIRD  = .$(BUILDID)-debug
 TRDPARTY = ..
 
-CCDEFS   = -m$(BIT_SIZE) -D_MACOS -D_$(BIT_SIZE)BIT -Wall
+CCDEFS   = -m$(BIT_SIZE) $(ARCFLAGS) -D_MACOS -D_$(BIT_SIZE)BIT -Wall
 CCFLAGSR = -O3 -flto -DNDEBUG=1 -Wno-uninitialized
 CCFLAGSD = -g
-LDDEFS   = -m$(BIT_SIZE)
+LDDEFS   = -m$(BIT_SIZE) $(ARCFLAGS)
 LDFLAGSR = -O3 -flto
 LDFLAGSD = -g
 ARFLAGSR = rcs

diff --git a/microemacs/src/macoscc.mak b/microemacs/src/macoscc.mak
@@ -251,18 +251,18 @@ $(INSTDIR):
 	-mkdir $(INSTDIR)
 
 $(TRDPARTY)/zlib/$(BOUTDIR)/zlib$(A):
-	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak BCFG=$(BCFG)
+	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG)
 
 $(TRDPARTY)/tfs/$(BOUTDIR)/tfs$(A):
-	cd $(TRDPARTY)/tfs && $(MK) -f $(MAKEFILE).mak BCFG=$(BCFG)
+	cd $(TRDPARTY)/tfs && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG)
 
 clean:
 	$(RMDIR) $(OUTDIR)
-	cd $(TRDPARTY)/tfs && $(MK) -f $(MAKEFILE).mak clean
-	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak clean
+	cd $(TRDPARTY)/tfs && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG) clean
+	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG) clean
 
 spotless: clean
 	$(RM) *~
 	$(RM) tags
-	cd $(TRDPARTY)/tfs && $(MK) -f $(MAKEFILE).mak spotless
-	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak spotless
+	cd $(TRDPARTY)/tfs && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG) spotless
+	cd $(TRDPARTY)/zlib && $(MK) -f $(MAKEFILE).mak ARCHITEC=$(ARCHITEC) BCFG=$(BCFG) spotless