Add network output compatible with MAME.

.github/workflows/build.yml

@@ -63,7 +63,7 @@ jobs:
 
       - name: Build Supermodel
         run: |
-          make -f Makefiles/${{ matrix.makefile }} release NET_BOARD=1 OPT="${OPT_INPUT:-"-O3"}" GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} SILENT=
+          make -f Makefiles/${{ matrix.makefile }} release OPT="${OPT_INPUT:-"-O3"}" GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} SILENT=
 
       - name: Validate build
         run: |
@@ -78,7 +78,7 @@ jobs:
 
       - name: Create package
         run: |
-          make -f Makefiles/${{ matrix.makefile }} pkg NET_BOARD=1 GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} SILENT=
+          make -f Makefiles/${{ matrix.makefile }} pkg GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} SILENT=
 
       - name: Find and upload package
         run: |

Docs/README.txt

@@ -1531,6 +1531,52 @@ All settings are case sensitive.
 
     ----------------
 
+    Name:           Outputs
+
+    Argument:       String.
+
+    Description:    Manages MAME Hooker compatible outputs.
+                    Valid options are:
+                      - none    - default, disables outputs.
+                      - win     - Use Windows messages (only on Windows).
+                      - net     - Use network messages.
+
+                    See OutputsWithLF, OutputsTCPPort and
+                    OutputsUDPBroadcastPort settings when using 'net' option.
+                    Can only be set in the 'Global' section.
+
+    ----------------
+
+    Name:           OutputsWithLF
+
+    Argument:       Boolean value (true or false).
+
+    Description:    When using 'net' option for 'Outputs', this setting determines whether
+                    messages are terminated with a line feed character.  The
+                    default is false. Can only be set in 'Global' section.
+
+    ----------------
+
+    Name:           OutputsTCPPort
+
+    Argument:       Integer value.
+
+    Description:    When using 'net' option for 'Outputs', this setting determines the
+                    TCP port to use for network messages. Can only be set in 'Global'
+                    section.
+
+    ----------------
+
+    Name:           OutputsUDPBroadcastPort
+
+    Argument:       Integer value.
+
+    Description:    When using 'net' option for 'Outputs', this setting determines the
+                    UDP broadcast port to use for network messages. Can only be set
+                    in 'Global' section.
+
+    ----------------
+
     Names:          InputStart1
                     InputStart2
                     InputCoin1

Makefiles/Makefile.OSX

@@ -64,10 +64,7 @@ LD = clang
 #
 
 SDL_CFLAGS =
-SDL_LIBS = -framework SDL2 -framework OpenGL -framework GLUT -framework Cocoa
-ifeq ($(strip $(NET_BOARD)),1)
-	SDL_LIBS += -framework SDL2_net
-endif
+SDL_LIBS = -framework SDL2 -framework SDL2_net -framework OpenGL -framework GLUT -framework Cocoa
 
 #
 # macOS-specific

Makefiles/Makefile.UNIX

@@ -64,9 +64,7 @@ LD = gcc
 
 SDL2_CFLAGS = `sdl2-config --cflags`
 SDL2_LIBS = `sdl2-config --libs`
-ifeq ($(strip $(NET_BOARD)),1)
-	SDL2_LIBS += -lSDL2_net
-endif
+SDL2_LIBS += -lSDL2_net
 
 #
 #	UNIX-specific

Makefiles/Makefile.Win32

@@ -95,9 +95,7 @@ else
 	SDL2_LIBS = $(shell sdl2-config --static-libs | sed 's/-mwindows//g')
 	SDL2_CFLAGS = $(shell sdl2-config --cflags)
 endif
-ifeq ($(strip $(NET_BOARD)),1)
-	SDL2_LIBS += -lSDL2_net -liphlpapi
-endif
+SDL2_LIBS += -lSDL2_net -liphlpapi
 
 #
 # MinGW/Windows-specific

Makefiles/Options.inc

@@ -51,14 +51,6 @@ ifneq ($(filter $(strip $(EXTRA_DEBUG)),0 1),$(strip $(EXTRA_DEBUG)))
 	override EXTRA_DEBUG =
 endif
 
-#
-# Enable support for Model3 Net Board emulation
-#
-NET_BOARD =
-ifneq ($(filter $(strip $(NET_BOARD)),0 1),$(strip $(NET_BOARD)))
-	override NET_BOARD =
-endif
-
 #
 # Include console-based debugger in emulator ('yes' or 'no')
 #

Makefiles/Rules.inc

@@ -52,11 +52,6 @@ ifeq ($(strip $(EXTRA_DEBUG)),1)
 	SUPERMODEL_BUILD_FLAGS += -DDEBUG
 endif
 
-# If Net Board support is enabled, need to define NET_BOARD
-ifeq ($(strip $(NET_BOARD)),1)
-	SUPERMODEL_BUILD_FLAGS += -DNET_BOARD
-endif
-
 # If built-in debugger enabled, need to define SUPERMODEL_DEBUGGER
 ifeq ($(strip $(ENABLE_DEBUGGER)),1)
 	SUPERMODEL_BUILD_FLAGS += -DSUPERMODEL_DEBUGGER
@@ -176,16 +171,13 @@ SRC_FILES = \
 	Src/Pkgs/imgui/imgui_tables.cpp \
 	Src/Pkgs/imgui/imgui_widgets.cpp \
 	Src/ROMSet.cpp \
+	Src/OSD/SDL/NetOutputs.cpp \
+	Src/Network/TCPReceive.cpp \
+	Src/Network/TCPSend.cpp \
+	Src/Network/NetBoard.cpp \
+	Src/Network/SimNetBoard.cpp \
 	$(PLATFORM_SRC_FILES)
 
-ifeq ($(strip $(NET_BOARD)),1)
-	SRC_FILES += \
-		Src/Network/TCPReceive.cpp \
-		Src/Network/TCPSend.cpp \
-		Src/Network/NetBoard.cpp \
-		Src/Network/SimNetBoard.cpp
-endif
-
 ifeq ($(strip $(ENABLE_DEBUGGER)),1)
 	SRC_FILES += \
 		Src/Debugger/Debugger.cpp \

README.md

@@ -50,18 +50,12 @@ pacman -S mingw64/mingw-w64-x86_64-SDL2_net
 
 At this point, you can continue using either the MSYS2 shell or Windows Command Prompt but ensure that both ```gcc``` and ```mingw32-make``` are in your path. In MSYS2, the location of these binaries will be ```/mingw64/bin``` and for Command Prompt, assuming MSYS2 was installed in the default location, add ```C:\msys64\mingw64\bin``` to your Windows ```PATH``` variable.
 
-To build Supermodel without network support, use:
+To build Supermodel use (Network support built in by default now, no need to specify anymore):
 
 ```
 mingw32-make -f Makefiles/Makefile.Win32
 ```
 
-For network support:
-
-```
-mingw32-make -f Makefiles/Makefile.Win32 NET_BOARD=1
-```
-
 ### Linux
 
 Ensure SDL2 is installed. Most package managers ought to have this available. For example, on Ubuntu, it should be sufficient to run:
@@ -78,12 +72,6 @@ And then build Supermodel:
 make -f Makefiles/Makefile.UNIX
 ```
 
-For network support:
-
-```
-make -f Makefiles/Makefile.UNIX NET_BOARD=1
-```
-
 ### macOS
 
 Ensure Apple's Xcode Command Line Tools are installed:
@@ -106,12 +94,6 @@ And then build Supermodel:
 make -f Makefiles/Makefile.OSX
 ```
 
-For network support:
-
-```
-make -f Makefiles/Makefile.OSX NET_BOARD=1
-```
-
 ### Note: running on macOS
 If you try and run a macOS binary that was downloaded from the internet and/or built on a different machine, you need to grant macOS permission to execute the binary (just 1-time):