PCE enhancements

Moderate savestate size reduction.  Build system changes.

waterbox/common.mak

@@ -23,7 +23,8 @@ print-%: ;
 
 CC := $(SYSROOT)/bin/musl-gcc
 COMMONFLAGS := -mabi=ms -fvisibility=hidden -I$(WATERBOX_DIR)/emulibc -Wall -mcmodel=large \
-	-mstack-protector-guard=global -no-pie -fno-pic -fno-pie
+	-mstack-protector-guard=global -no-pie -fno-pic -fno-pie \
+	-MD -MP
 CCFLAGS := $(CCFLAGS) $(COMMONFLAGS)
 LDFLAGS := $(LDFLAGS) -static -Wl,--eh-frame-hdr -T $(WATERBOX_DIR)/linkscript.T #-Wl,--plugin,$(LD_PLUGIN)
 CCFLAGS_DEBUG := -O0 -g
@@ -106,3 +107,6 @@ clean-release:
 	rm -rf $(OUT_DIR)/release
 clean-debug:
 	rm -rf $(OUT_DIR)/debug
+
+-include $(OBJS:%o=%d)
+-include $(DOBJS:%o=%d)

waterbox/nyma/.vscode/c_cpp_properties.json

@@ -5,6 +5,7 @@
             "includePath": [
 				"${workspaceFolder}",
 				"${workspaceFolder}/mednafen/include",
+				"${workspaceFolder}/mednafen",
 				"${workspaceFolder}/common",
 				"${workspaceFolder}/mednafen/src/trio",
 				"${workspaceFolder}/../sysroot/include",

waterbox/nyma/NymaCore.cpp

@@ -1,7 +1,7 @@
 #include "mednafen/src/types.h"
 #include <emulibc.h>
 #include <waterboxcore.h>
-#include <mednafen/mednafen.h>
+#include <src/mednafen.h>
 #include <stdint.h>
 #include "mednafen/src/FileStream.h"
 #include "nyma.h"

waterbox/nyma/cdrom.cpp

@@ -1,12 +1,12 @@
 #include "mednafen/src/types.h"
 #include <emulibc.h>
 #include <waterboxcore.h>
-#include <mednafen/mednafen.h>
+#include <src/mednafen.h>
 #include <stdint.h>
-#include <mednafen/cdrom/CDInterface.h>
-#include <mednafen/cdrom/CDInterface_MT.h>
-#include <mednafen/cdrom/CDInterface_ST.h>
-#include <mednafen/cdrom/CDAccess.h>
+#include <src/cdrom/CDInterface.h>
+#include <src/cdrom/CDInterface_MT.h>
+#include <src/cdrom/CDInterface_ST.h>
+#include <src/cdrom/CDAccess.h>
 #include <trio/trio.h>
 
 #include "cdrom.h"

waterbox/nyma/cdrom.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "mednafen/src/types.h"
-#include <mednafen/mednafen.h>
-#include <mednafen/cdrom/CDInterface.h>
+#include <src/mednafen.h>
+#include <src/cdrom/CDInterface.h>
 
 class CDInterfaceNyma : public Mednafen::CDInterface
 {

waterbox/nyma/common.mak

@@ -1,7 +1,7 @@
 # common things across all mednafen cores
 
 MEDNAFLAGS := \
-	-Imednafen/include -Icommon -Imednafen/src/trio \
+	-Imednafen -Icommon -Imednafen/src/trio \
 	-DHAVE_CONFIG_H=1 -DMDFN_DISABLE_NO_OPT_ERRWARN=1 \
 	-fwrapv \
 	-fno-strict-aliasing \

waterbox/nyma/common/minilzo/minilzo.h

@@ -1 +1 @@
-#include <mednafen/minilzo/_minilzo.h>
+#include <src/minilzo/_minilzo.h>

waterbox/nyma/mednafen

@@ -1 +1 @@
-Subproject commit 740d63996fc7cebffd39ee253a29ee434965db21
+Subproject commit fe36c52dffe228848e41680d7d4008e76816c381