Merge branch 'master' of https://github.com/ericb59/Fusion-C-v1.2

ericb59 · Oct 19, 2020 · a500c76 · a500c76
2 parents d369a3f + 28d76ef
commit a500c76
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/Working Folder/Makefile b/Working Folder/Makefile
@@ -10,8 +10,8 @@
 #|                     V1.2 - August 2019                    |
 #|                                                           |
 #|                                                           |
-#|               Compilation Script for MacOS                |
-#|                 (may be for linux too ! ?)                |
+#|          Compilation Script for MacOS and Linux           |
+#|                                                           |
 #|                                                           |
 #\___________________________________________________________/
 #
@@ -76,7 +76,7 @@ CCFLAGS = --code-loc $(ADDR_CODE) --data-loc $(ADDR_DATA) --disable-warning 196
 all:  $(REL_FILES) $(COM_FILES) clean emulator
 
 %.ihx: %.c
-	@SDCC $(CCFLAGS) $^
+	@sdcc $(CCFLAGS) $^
 	@echo "..•̀ᴗ•́)و .. $(CC) is Processing ... !"
 
 %.com: %.ihx

diff --git a/Working Folder/openMSX/emul_start.sh b/Working Folder/openMSX/emul_start.sh
@@ -1,13 +1,29 @@
-#!/bin/bash	
 # OpenMSX Start Script
 # The emulator will be started only if it's not already active
 
+#MacOS
+if [ "$(uname -s)" = "Darwin" ]; then
+	xopenmsx=`ps x | grep "openmsx " | grep -v grep`
+
+	if [ "${xopenmsx}" = "" ]; then
+	  echo "...Now Starting OpenMsx "
+	  ./openMSX/openMSX.app/Contents/MacOS/openmsx -script ./openMSX/emul_start_config.txt | NULL
+	else
+	  echo "...openMSX already running "
+	fi
 
-xopenmsx=`ps x | grep "openmsx " | grep -v grep`
-
-if [ "${xopenmsx}" == "" ]; then
-  echo "...Now Starting OpenMsx "
-  ./openMSX/openMSX.app/Contents/MacOS/openmsx -script ./openMSX/emul_start_config.txt | NULL
+#Linux
+elif [ "$(uname -s)" = "Linux" ]; then
+	xopenmsx=`pgrep "openmsx"`
+
+	if [ "${xopenmsx}" = "" ]; then
+		echo "...Now Starting OpenMSX "
+		/opt/openMSX/bin/openmsx -script ./openMSX/emul_start_config.txt
+	else
+		echo "...openMSX already running "
+	fi
+
+#Other
 else
-  echo "...openMSX already running "
-fi
+	echo "Failed to identify OS"
+fi
diff --git a/Working Folder/openMSX/readme.txt b/Working Folder/openMSX/readme.txt
@@ -1 +1,2 @@
-Copy here the OPenMSX Executable. Previously set with needed system roms.
+MacOS and Windows: Copy here the OpenMSX Executable. Previously set with needed system roms.
+Linux: This script assumes you've compiled the emulator with make install, which puts the executable in /opt/openMSX/bin. Change if needed.