Removes NET_BOARD build variables and always builds net board support.

Author: tbreckle

.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: |

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
@@ -177,16 +172,12 @@ SRC_FILES = \
 	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):
 

Scripts/supermodel_build_bot.py

@@ -240,7 +240,7 @@ def update_git_snapshot(working_dir, username, password, test_run, make):
       if result.returncode != 0:
         raise BuildError("Failed to obtain version")
       version = result.stdout.decode().strip()
-      result = bash.execute(working_dir=repo_dir, command=make + " -f Makefiles/Makefile.Win32 release NET_BOARD=1", print_output=False)
+      result = bash.execute(working_dir=repo_dir, command=make + " -f Makefiles/Makefile.Win32 release", print_output=False)
       if result.returncode != 0:
         raise BuildError("Build failed")
 

Src/Debugger/SupermodelDebugger.cpp

@@ -32,9 +32,7 @@
 #include "ConsoleDebugger.h"
 #include "CPUDebug.h"
 #include "Label.h"
-#ifdef NET_BOARD
 #include "Network/NetBoard.h"
-#endif // NET_BOARD
 #include "CPU/Musashi68KDebug.h"
 #include "CPU/PPCDebug.h"
 #include "CPU/Z80Debug.h"
@@ -78,13 +76,8 @@ namespace Debugger
 		cpu->AddRegion(0x90000000, 0x9000000B, false, false, "Real3D VROM Texture Port");
 		cpu->AddRegion(0x94000000, 0x940FFFFF, false, false, "Real3D Texture FIFO");
 		cpu->AddRegion(0x98000000, 0x980FFFFF, false, false, "Real3D Polygon RAM");
-#ifndef NET_BOARD
-		cpu->AddRegion(0xC0000000, 0xC00000FF, false, false, "SCSI (Step 1.x)");
-#endif
-#ifdef NET_BOARD
 		cpu->AddRegion(0xC0000000, 0xC000FFFF, false, false, "Netboard Shared RAM (Step 1.5+)");
 		cpu->AddRegion(0xC0020000, 0xC002FFFF, false, false, "Netboard Program RAM (Step 1.5+)");
-#endif
 		cpu->AddRegion(0xC1000000, 0xC10000FF, false, false, "SCSI (Step 1.x) (Lost World expects it here)");
 		cpu->AddRegion(0xC2000000, 0xC20000FF, false, false, "Real3D DMA (Step 2.x)");
 		cpu->AddRegion(0xF0040000, 0xF004003F, false, false, "Input (Controls) Registers");
@@ -312,7 +305,6 @@ namespace Debugger
 		return cpu;
 	}
 
-#ifdef NET_BOARD
 	CCPUDebug *CSupermodelDebugger::CreateNetBoardCPUDebug(::CModel3 * model3)
 	{
 		CNetBoard *netBrd = dynamic_cast<CNetBoard*>(model3->GetNetBoard());
@@ -336,7 +328,6 @@ namespace Debugger
 
 		return cpu;
 	}
-#endif
 
 	CSupermodelDebugger::CSupermodelDebugger(::CModel3 *model3, ::CInputs *inputs, std::shared_ptr<CLogger> logger) :
 		CConsoleDebugger(), m_model3(model3), m_inputs(inputs), m_logger(logger),
@@ -365,11 +356,9 @@ namespace Debugger
 		cpu = CreateDriveBoardCPUDebug(m_model3);
 		if (cpu) AddCPU(cpu);
 
-#ifdef NET_BOARD
 		// Add net board CPU (if attached)
 		cpu = CreateNetBoardCPUDebug(m_model3);
 		if (cpu) AddCPU(cpu);
-#endif
 
 	}
 

Src/Debugger/SupermodelDebugger.h

@@ -79,9 +79,8 @@ namespace Debugger
 		static CCPUDebug *CreateDSBCPUDebug(::CModel3 *model3);
 
 		static CCPUDebug *CreateDriveBoardCPUDebug(::CModel3 *model3);
-#ifdef NET_BOARD
+
 		static CCPUDebug *CreateNetBoardCPUDebug(::CModel3 *model3);
-#endif
 
 		CSupermodelDebugger(::CModel3 *model3, ::CInputs *inputs, std::shared_ptr<CLogger> logger);