From 5ddfc628dc4eed194e5f6083f30138a2f2c32f5b Mon Sep 17 00:00:00 2001
From: Test User <test.user@mail.domain>
Date: Thu, 20 Jun 2024 23:01:46 +0200
Subject: [PATCH 1/3] Bugfix: __try and __except are MSVC specific

---
 oscar64/oscar64.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp
index 207c9fb..04ba2c4 100644
--- a/oscar64/oscar64.cpp
+++ b/oscar64/oscar64.cpp
@@ -567,16 +567,19 @@ int main(int argc, const char** argv)
 {
 #if 1
 #ifdef _WIN32
+#ifndef __GNUC__
 #ifndef _DEBUG
 	__try 
 	{
 #endif
 #endif
+#endif
 #endif
 		return main2(argc, argv);
 
 #if 1
 #ifdef _WIN32
+#ifndef __GNUC__
 #ifndef _DEBUG
 }
 	__except (seh_filter(GetExceptionCode(), GetExceptionInformation()))
@@ -586,4 +589,5 @@ int main(int argc, const char** argv)
 #endif
 #endif
 #endif
+#endif
 }

From 17f56d0a69ed42cef83c1c938058ab8399fcab1d Mon Sep 17 00:00:00 2001
From: Test User <test.user@mail.domain>
Date: Fri, 21 Jun 2024 23:00:17 +0200
Subject: [PATCH 2/3] Bugfix for GCC: order of objects and libs matters;
 prepared list of libs for GCC (MinGW)

---
 make/makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/make/makefile b/make/makefile
index 4e1b0a2..818d98f 100644
--- a/make/makefile
+++ b/make/makefile
@@ -17,8 +17,11 @@ else
 
 		linklibs = -lpthread
   	else
+		# MSVC
 		linklibs = -lrt -lpthread
-	endif
+		# MinGW
+		#linklibs = -lversion -lpthread
+      endif
 endif
  
 %.o: ../oscar64/%.cpp
@@ -31,7 +34,7 @@ endif
 	rm -f $@.$$$$
 
 ../bin/oscar64 : $(objects)
-	$(CXX) $(CPPFLAGS) $(linklibs) $(objects) -o ../bin/oscar64
+	$(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o ../bin/oscar64
 
 .PHONY : clean
 clean :

From 2d827275655a889ff0e73f3cdfe0b48be27177b2 Mon Sep 17 00:00:00 2001
From: Test User <test.user@mail.domain>
Date: Fri, 21 Jun 2024 23:17:09 +0200
Subject: [PATCH 3/3] Fixed spacing

---
 make/makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/makefile b/make/makefile
index 818d98f..1b609e6 100644
--- a/make/makefile
+++ b/make/makefile
@@ -16,12 +16,12 @@ else
 	ifeq ($(UNAME_S), Darwin)
 
 		linklibs = -lpthread
-  	else
+	else
 		# MSVC
 		linklibs = -lrt -lpthread
 		# MinGW
 		#linklibs = -lversion -lpthread
-      endif
+	endif
 endif
  
 %.o: ../oscar64/%.cpp