Merge pull request #1825 from reicast/einsteinx2/fix-macos-building

Fixed the Mac version!

Author: skmp

README.md

@@ -89,6 +89,10 @@ Building for iOS / MacOS
 ---
 Requirements:
 
+Due to the use of OpenMP, which is not included with the default Xcode LLVM compiler, you must first install LLVM and OpenMP using the Homebrew package manager: `brew install libomp llvm`
+
+[Install Homebrew](https://brew.sh/)
+
 [Latest Xcode](https://developer.apple.com/xcode/downloads/)
 
 * [iOSOpenDev](http://iosopendev.com/download/) if developing without an official Apple certificate
@@ -103,11 +107,11 @@ From project root directory:
 
 | iOS             | Mac                           |
 | --------------- | ----------------------------- |
-| `cd shell/ios/` | `cd shell/apple/emulator-osx` |
+| `cd reicast-emulator/reicast/apple/emulator-ios` | `cd reicast-emulator/reicast/apple/emulator-osx` |
 
 `xcodebuild -configuration Release`
 
-Or open the .xcodeproj in Xcode and hit "Build".
+Or open the workspace `reicast-emulator/reicast/apple/reicast.xcworkspace` in Xcode, choose the target, and press Command + B to build.
 
 Building for Linux
 ------------------

azure-pipelines.yml

@@ -0,0 +1,36 @@
+stages:
+- stage: Linux
+  jobs:
+  - job: Build
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+      - script: sudo dpkg --add-architecture i386 && sudo apt-get clean && sudo apt-get update && sudo apt-get install -y build-essential pkgconf libasound2-dev libgl1-mesa-dev libx11-dev libudev-dev git && sudo apt-get install -y libasound2-dev:i386 libgl1-mesa-dev:i386 libx11-dev:i386 libudev-dev:i386 libc6:i386 g++-multilib gcc-multilib && sudo apt-get install -y g++-mingw-w64-x86-64 mingw-w64-x86-64-dev libz-mingw-w64-dev libnpth-mingw-w64-dev
+        displayName: Install dependencies
+      - script: gcc --version && x86_64-w64-mingw32-gcc --version
+        displayName: Display toolchain info
+      - script: make -C reicast/linux -j `nproc` platform=x64
+        displayName: Linux x64 build
+      - script: make -C reicast/linux -j `nproc` platform=x64 NAOMI=1
+        displayName: Linux naomi x64 build
+      - script: make -C reicast/linux -j `nproc` platform=x86
+        displayName: Linux x86 build
+      - script: make -C reicast/linux -j `nproc` platform=win32 CC_PREFIX=x86_64-w64-mingw32-
+        displayName: Windows x64 (MinGW) build
+      - script: make -C reicast/linux -j `nproc` platform="x64 noexceptions"
+        displayName: Linux x64 (No Exceptions) build
+      - script: make -C reicast/linux -j `nproc` platform="x64 norwxpages"
+        displayName: Linux x64 (No RWX pages) build
+
+- stage: Mac
+  jobs:
+  - job: Build
+    pool:
+      vmImage: macOS-10.14
+    steps:
+    - script: brew install libomp llvm
+      displayName: Brew install dependencies
+    - script: |
+        sudo xcode-select -s /Applications/Xcode_11.3.1.app/Contents/Developer
+        cd reicast/apple/emulator-osx && xcodebuild -configuration Release
+      displayName: Select Xcode and Build

libswirl/build.h

@@ -325,7 +325,7 @@
 #endif
 
 #ifndef FEAT_HAS_SERIAL_TTY
-    #define FEAT_HAS_SERIAL_TTY (HOST_OS == OS_LINUX && !defined(_ANDROID))
+    #define FEAT_HAS_SERIAL_TTY (HOST_OS == OS_LINUX && !defined(_ANDROID)) || (HOST_OS == OS_DARWIN && !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR)
 #endif
 
 //Depricated build configs
@@ -460,4 +460,4 @@
 #define AICA_SDRAM_CLOCK (GD_CLOCK*2)		//[67737600]  GD-> PLL 2 -> SDRAM
 #define SH4_MAIN_CLOCK (200*1000*1000)		//[200000000] XTal(13.5) -> PLL (33.3) -> PLL 1:6 (200)
 #define SH4_RAM_CLOCK (100*1000*1000)		//[100000000] XTal(13.5) -> PLL (33.3) -> PLL 1:3 (100)	, also suplied to HOLLY chip
-#define G2_BUS_CLOCK (25*1000*1000)			//[25000000]  from Holly, from SH4_RAM_CLOCK w/ 2 2:1 plls
+#define G2_BUS_CLOCK (25*1000*1000)			//[25000000]  from Holly, from SH4_RAM_CLOCK w/ 2 2:1 plls

libswirl/deps/zlib/zlib.xcodeproj/project.pbxproj

@@ -99,6 +99,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 87D776C01EF5623200E08B55;
@@ -114,23 +115,19 @@
 		87D776C21EF5623200E08B55 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx10.6;
 			};
 			name = Debug;
 		};
 		87D776C31EF5623200E08B55 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				SDKROOT = macosx10.6;
 			};
 			name = Release;
 		};

libswirl/gui/gui_settings_advanced.cpp

@@ -108,4 +108,4 @@ void gui_settings_advanced()
 		ImGui::PopStyleVar();
 		ImGui::EndTabItem();
 	}
-}
+}

libswirl/hw/sh4/modules/scif.cpp

@@ -22,28 +22,24 @@ SCIF_SCFDR2_type SCIF_SCFDR2;
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <errno.h>
 extern int pty_master;
 #endif
 
-int SerialHasPendingData() {
-	int bytes_avaiable = 0;
-	#if FEAT_HAS_SERIAL_TTY
-		if (pty_master != -1) {
-			ioctl(pty_master, FIONREAD, &bytes_avaiable);
-			return bytes_avaiable;
-		}
-	#endif
-	return bytes_avaiable;
-}
-
-void SerialReadData(u8* buffer, size_t nbytes) {
-	u8 rd = 0;
-	#if FEAT_HAS_SERIAL_TTY
-		if (pty_master != -1){
-			while(read(pty_master, buffer, nbytes) != nbytes)
-				printf("SERIAL: PTY read failed, %d\n", errno);
-		}
-	#endif
+int SerialReadData(u8* buffer, size_t nbytes) {
+#if FEAT_HAS_SERIAL_TTY
+    if (pty_master != -1) {
+        int bytes_read = (int)read(pty_master, buffer, nbytes);
+        if (bytes_read >= 0) {
+            return bytes_read;
+        } else if (bytes_read < 0 && errno != EAGAIN) {
+            // Some error other than "no data available" occurred during read
+            printf("SERIAL: PTY read failed, %s\n", strerror(errno));
+        }
+    }
+#endif
+    
+    return -1;
 }
 
 void SerialWriteData(u8 data) {
@@ -53,7 +49,7 @@ void SerialWriteData(u8 data) {
 #if FEAT_HAS_SERIAL_TTY
 		if (pty_master != -1) {
 			while(write(pty_master, &data, 1) != 1)
-				printf("SERIAL: PTY write failed, %d\n", errno);
+				printf("SERIAL: PTY write failed, %s\n", strerror(errno));
 		}
 #endif
 }
@@ -99,20 +95,13 @@ struct Sh4ModScif_impl : Sh4ModScif
 
 	bool FifoRefill()
 	{
-		auto bytes = SerialHasPendingData();
-		if (!bytes)
-			return false;
-
-		if (bytes > 64)
-			bytes = 64;
-
 		u8 temp[64];
-		SerialReadData(temp, bytes);
-		for (int i = 0; i<bytes; i++) {
+		int bytes_read = SerialReadData(temp, 64);
+		for (int i = 0; i<bytes_read; i++) {
 			fifo.push(temp[i]);
 		}
 
-		return true;
+		return bytes_read > 0;
 	}
 
 	u8 FifoRead()
@@ -241,4 +230,4 @@ struct Sh4ModScif_impl : Sh4ModScif
 
 Sh4ModScif* Sh4ModScif::Create(SuperH4Mmr* sh4mmr) {
 	return new Sh4ModScif_impl(sh4mmr);
-}
+}

libswirl/linux-dist/main.cpp

@@ -194,8 +194,6 @@ void os_CreateWindow()
 	#endif
 }
 
-void common_linux_setup();
-
 #ifdef TARGET_PANDORA
 
 	void clean_exit(int sig_num)
@@ -405,13 +403,13 @@ void os_gl_term()
 	#endif
 }
 
+void common_linux_setup();
 #if FEAT_HAS_SERIAL_TTY
-int pty_master;
+bool common_serial_pty_setup();
 #endif
 
 int main(int argc, wchar* argv[])
 {
-
 	#ifdef TARGET_PANDORA
 		signal(SIGSEGV, clean_exit);
 		signal(SIGKILL, clean_exit);
@@ -446,46 +444,10 @@ int main(int argc, wchar* argv[])
 
 	if (reicast_init(argc, argv))
 		die("Reicast initialization failed\n");
-
-#if FEAT_HAS_SERIAL_TTY
-	bool cleanup_pty_symlink = false;
-	if (settings.debug.VirtualSerialPort) {
-		int slave;
-		char slave_name[2048];
-		pty_master = -1;
-		if (openpty(&pty_master, &slave, slave_name, nullptr, nullptr) >= 0)
-		{
-			// Turn ECHO off, we don't want to loop-back
-			struct termios tp;
-			tcgetattr(pty_master, &tp);
-			tp.c_lflag &= ~ECHO;
-			tcsetattr(pty_master, TCSAFLUSH, &tp);
-
-			printf("Serial: Created virtual serial port at %s\n", slave_name);
-
-			if (settings.debug.VirtualSerialPortFile.size())
-			{
-				if (symlink(slave_name, settings.debug.VirtualSerialPortFile.c_str()) == 0)
-				{
-					cleanup_pty_symlink = true;
-					printf("Serial: Created symlink to %s\n",  settings.debug.VirtualSerialPortFile.c_str());
-				}
-				else
-				{
-					printf("Serial: Failed to create symlink to %s, %d\n", settings.debug.VirtualSerialPortFile.c_str(), errno);
-				}
-			}
-			// not for us to use, we use master
-			// do not close to avoid EIO though
-			// close(slave);
-		}
-		else
-		{
-			printf("Serial: Failed to create PTY: %d\n", errno);
-		}
-		
-	}
-#endif
+    
+    #if FEAT_HAS_SERIAL_TTY
+    bool cleanup_pty_symlink = common_serial_pty_setup();
+    #endif
 
 	#if FEAT_HAS_NIXPROF
 	install_prof_handler(1);