Merge pull request #190 from hbeni/fixMacBuild

Plugin: Tests/catch2 upgraded to 3.5.3
hbeni · May 13, 2024 · 4d4e4f7 · 4d4e4f7
2 parents 60f69cd + 7786c55
commit 4d4e4f7
Show file tree

Hide file tree

Showing 7 changed files with 25,443 additions and 17,983 deletions.
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -33,7 +33,7 @@ jobs:
 
     - name: Build and run CATCH2 tests
       run: |
-        make -C client/mumble-plugin/ CC=g++-11 test
+        make -C client/mumble-plugin/ CC=g++-13 CFLAGS+=-ld_classic test
 
     - name: Build Plugin
       run: |
@@ -126,7 +126,7 @@ jobs:
 
     - name: Build and run CATCH2 tests
       run: |
-        make -C client/mumble-plugin/ DEBUG+="-g3 -Og -DDEBUG" CC=g++-11 test
+        make -C client/mumble-plugin/ DEBUG+="-g3 -Og -DDEBUG" CC=g++-13 CFLAGS+=-ld_classic test
 
     - name: Build Plugin
       run: |

diff --git a/client/mumble-plugin/Makefile b/client/mumble-plugin/Makefile
@@ -75,7 +75,7 @@ test: libs test/catch2/tests-main.o test/catch2/tests-main.o test/catch2/radioMo
 
 # clean compile results
 clean:
-	rm -f *.o *.rc lib/*.o test/catch2/*.catch2
+	rm -f *.o *.rc lib/*.o test/catch2/*.catch2 test/catch2/*.o
 
 # clean compile results and binarys
 clean-all: clean
@@ -151,10 +151,10 @@ plugin-win-dllresource:
 	$(mingwprefix)windres dllResource.rc dllResource.o
 
 # shortcut for building natively on macOS
-plugin-macOS: CC=g++-11
+plugin-macOS: CC=g++-13
 plugin-macOS: outname=fgcom-mumble-macOS.bundle
 plugin-macOS: openssl-macOS
-	make CC=$(CC) outname=$(outname) plugin
+	make CC=$(CC) outname=$(outname) CFLAGS+=-ld_classic plugin
 
 # OpenSSL
 # The sources are located under lib/openssl as git submodule, and supposed to point to the latest stable head