From 508ad40e44df61ccff63f84e73e05ffbe75e95aa Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Sun, 19 Nov 2023 19:38:26 -0500
Subject: [PATCH] Change output name to sm64coopdx & clean up a bit

---
 Makefile            | 34 ++++------------------------------
 src/pc/configfile.c |  4 ++++
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index ef11a3fb..acc149f1 100644
--- a/Makefile
+++ b/Makefile
@@ -305,7 +305,7 @@ TARGET := sm64.$(VERSION)
 #   f3d_new - default for EU and Shindou versions
 #   f3dex   -
 #   f3dex2  -
-#   f3dex2e -
+#   f3dex2e - default for PC Port
 #   f3dzex  - newer, experimental microcode used in Animal Crossing
 $(eval $(call validate-option,GRUCODE,f3d_old f3dex f3dex2 f3dex2e f3d_new f3dzex))
 
@@ -381,29 +381,14 @@ endif
 
 ifeq ($(NON_MATCHING),1)
   DEFINES += NON_MATCHING=1 AVOID_UB=1
-  COMPARE := 0
 endif
 
-
-# COMPARE - whether to verify the SHA-1 hash of the ROM after building
-#   1 - verifies the SHA-1 hash of the selected version of the game
-#   0 - does not verify the hash
-COMPARE ?= 1
-$(eval $(call validate-option,COMPARE,0 1))
-
 ifeq ($(OSX_BUILD),0)
 	USE_APP := 0
 else ifeq ($(shell uname -m),arm64)
   DISCORD_SDK := 0
 endif
 
-TARGET_STRING := sm64.$(VERSION).$(GRUCODE)
-# If non-default settings were chosen, disable COMPARE
-ifeq ($(filter $(TARGET_STRING), sm64.jp.f3d_old sm64.us.f3d_old sm64.eu.f3d_new sm64.sh.f3d_new),)
-  COMPARE := 0
-endif
-
-
 # Whether to hide commands or not
 VERBOSE ?= 0
 ifeq ($(VERBOSE),0)
@@ -418,12 +403,6 @@ ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
   $(info ==== Build Options ====)
   $(info Version:        $(VERSION))
   $(info Microcode:      $(GRUCODE))
-  $(info Target:         $(TARGET))
-  ifeq ($(COMPARE),1)
-    $(info Compare ROM:    yes)
-  else
-    $(info Compare ROM:    no)
-  endif
   ifeq ($(NON_MATCHING),1)
     $(info Build Matching: no)
   else
@@ -499,12 +478,12 @@ BUILD_DIR_BASE := build
 BUILD_DIR := $(BUILD_DIR_BASE)/$(VERSION)_pc
 
 ifeq ($(WINDOWS_BUILD),1)
-	EXE := $(BUILD_DIR)/$(TARGET_STRING).exe
+	EXE := $(BUILD_DIR)/sm64coopdx.exe
 else # Linux builds/binary namer
 	ifeq ($(TARGET_RPI),1)
-		EXE := $(BUILD_DIR)/$(TARGET_STRING).arm
+		EXE := $(BUILD_DIR)/sm64coopdx.arm
 	else
-		EXE := $(BUILD_DIR)/$(TARGET_STRING)
+		EXE := $(BUILD_DIR)/sm64coopdx
 	endif
 endif
 
@@ -1157,11 +1136,6 @@ exemap: $(EXE)
 all: exemap
 endif
 
-ifeq ($(COMPARE),1)
-	@$(PRINT) "$(GREEN)Checking if ROM matches.. $(NO_COL)\n"
-	@$(SHA1SUM) --quiet -c $(TARGET).sha1 && $(PRINT) "$(TARGET): $(GREEN)OK$(NO_COL)\n" || ($(PRINT) "$(YELLOW)Building the ROM file has succeeded, but does not match the original ROM.\nThis is expected, and not an error, if you are making modifications.\nTo silence this message, use 'make COMPARE=0.' $(NO_COL)\n" && false)
-endif
-
 clean:
 	$(RM) -r $(BUILD_DIR_BASE)
 
diff --git a/src/pc/configfile.c b/src/pc/configfile.c
index ea09b9d3..227ae97d 100644
--- a/src/pc/configfile.c
+++ b/src/pc/configfile.c
@@ -601,6 +601,9 @@ NEXT_OPTION:
 }
 
 void configfile_load(void) {
+#ifdef DEVELOPMENT
+    configfile_load_internal(configfile_name(), NULL);
+#else
     bool configReadError = false;
     configfile_load_internal(configfile_name(), &configReadError);
     if (configReadError) {
@@ -608,6 +611,7 @@ void configfile_load(void) {
     } else {
         configfile_save(configfile_backup_name());
     }
+#endif
 }
 
 // Writes the config file to 'filename'