ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add some missing updates to ares, cleanup build process a bit

This commit is contained in:
CasualPokePlayer 2022-11-28 19:50:03 -08:00
parent 8667dd9ee7
commit 137634cf89
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/ares64.wbx.zst
View File

Binary file not shown.

12
waterbox/ares64/BizInterface.cpp
View File

@ -3,8 +3,6 @@
#include <emulibc.h>
#include <waterboxcore.h>
#include <vector>
#define EXPORT extern "C" ECL_EXPORT
typedef enum
@ -396,11 +394,15 @@ static bool LoadRom(LoadData* loadData, bool isPal)
string cic = isPal ? "CIC-NUS-7101" : "CIC-NUS-6102";
u32 crc32 = Hash::CRC32({&data[0x40], 0x9C0}).value();
if (crc32 == 0x1DEB51A9) cic = isPal ? "CIC-NUS-7102" : "CIC-NUS-6101";
if (crc32 == 0x1DEB51A9) cic = "CIC-NUS-6101";
if (crc32 == 0xEC8B1325) cic = "CIC-NUS-7102";
if (crc32 == 0xC08E5BD6) cic = isPal ? "CIC-NUS-7101" : "CIC-NUS-6102";
if (crc32 == 0x03B8376A) cic = isPal ? "CIC-NUS-7103" : "CIC-NUS-6103";
if (crc32 == 0xCF7F41DC) cic = isPal ? "CIC-NUS-7105" : "CIC-NUS-6105";
if (crc32 == 0xD1059C6A) cic = isPal ? "CIC-NUS-7106" : "CIC-NUS-6106";
if (crc32 == 0x0C965795) cic = "CIC-NUS-8303";
if (crc32 == 0x10C68B18) cic = "CIC-NUS-8401";
if (crc32 == 0x8FEBA21E) cic = "CIC-NUS-DDUS";
platform->bizpak->setAttribute("cic", cic);
SaveType save = DetectSaveType(data);
@ -455,8 +457,6 @@ static bool LoadDisk(LoadData* loadData)
diskErrorData = new array_view<u8>(data, len);
platform->bizpak->append(name, *diskErrorData);
ares::Nintendo64::dd.rtcCallback = GetBizTime;
if (auto port = root->find<ares::Node::Port>("Nintendo 64DD/Disk Drive"))
{
port->allocate();
@ -475,7 +475,9 @@ EXPORT bool Init(LoadData* loadData, ControllerType* controllers, bool isPal, bo
platform = new BizPlatform;
platform->bizpak = new vfs::directory;
ares::platform = platform;
biztime = initTime;
ares::Nintendo64::dd.rtcCallback = GetBizTime;
u8* data;
u32 len;

20
waterbox/ares64/Makefile
View File

@ -1,15 +1,17 @@
NEED_LIBCO := 1
ARES_PATH = $(ROOT_DIR)/ares/ares
ANGRYLION_PATH = $(ROOT_DIR)/ares/thirdparty/angrylion-rdp/mylittle-nocomment
THIRDPARTY_PATH = $(ROOT_DIR)/ares/thirdparty
ANGRYLION_PATH = $(THIRDPARTY_PATH)/angrylion-rdp/mylittle-nocomment
SLJIT_PATH = $(THIRDPARTY_PATH)/sljit/sljit_src
CXXFLAGS := -std=c++17 -msse4.2 \
-I../libco -I.$(ROOT_DIR)/ares/ -I.$(ROOT_DIR)/ares/thirdparty/ -I.$(ARES_PATH) \
CXXFLAGS := -std=gnu++17 -march=nehalem \
-I../libco -I.$(ROOT_DIR)/ares -I.$(ARES_PATH) -I.$(THIRDPARTY_PATH) -I.$(ANGRYLION_PATH) \
-Werror=int-to-pointer-cast -Wno-unused-but-set-variable -Wno-format-security \
-Wno-parentheses -Wno-reorder -Wno-unused-variable -Wno-delete-non-virtual-dtor \
-Wno-sign-compare -Wno-switch -Wno-unused-local-typedefs -Wno-bool-operation \
-fno-strict-aliasing -fwrapv -fno-operator-names \
-I.$(ANGRYLION_PATH) -DANGRYLION_RDP
-fno-strict-aliasing -fwrapv -fno-operator-names -fexpensive-optimizations \
-DSLJIT_HAVE_CONFIG_PRE=1 -DSLJIT_HAVE_CONFIG_POST=1
TARGET = ares64.wbx
@ -42,6 +44,12 @@ SRCS_ANGRYLION = \
$(ANGRYLION_PATH)/main.cpp \
$(ANGRYLION_PATH)/n64video.cpp
SRCS = $(SRCS_PROCESSORS) $(SRCS_ARES) $(SRCS_N64) $(SRCS_ANGRYLION) BizInterface.cpp
#note these are not actually used as recompiler is disabled
#these still need to be built though if you want a debug build
SRCS_SLJIT = \
$(SLJIT_PATH)/sljitLir.c \
$(THIRDPARTY_PATH)/sljitAllocator.cpp
SRCS = $(SRCS_PROCESSORS) $(SRCS_ARES) $(SRCS_N64) $(SRCS_ANGRYLION) $(SRCS_SLJIT) BizInterface.cpp
include ../common.mak