diff --git a/macos/mkxp-z.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macos/mkxp-z.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000..08de0be8
--- /dev/null
+++ b/macos/mkxp-z.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>
diff --git a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel (Steam).xcscheme b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel (Steam).xcscheme
index 8329051a..98afbda6 100644
--- a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel (Steam).xcscheme	
+++ b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel (Steam).xcscheme	
@@ -56,6 +56,13 @@
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "MKXPZ_SELECT_PATH"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"
diff --git a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel.xcscheme b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel.xcscheme
index a78bf9ad..698683af 100644
--- a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel.xcscheme
+++ b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel.xcscheme
@@ -56,6 +56,13 @@
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "MKXPZ_SELECT_PATH"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"
diff --git a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal (Steam).xcscheme b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal (Steam).xcscheme
index 865a6aea..ed568e1b 100644
--- a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal (Steam).xcscheme	
+++ b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal (Steam).xcscheme	
@@ -50,6 +50,13 @@
             ReferencedContainer = "container:mkxp-z.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "MKXPZ_SELECT_PATH"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal.xcscheme b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal.xcscheme
index a64f8eb4..c94d74f3 100644
--- a/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal.xcscheme
+++ b/macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal.xcscheme
@@ -56,6 +56,13 @@
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "MKXPZ_SELECT_PATH"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"
@@ -78,7 +85,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/src/filesystem/filesystemImpl.h b/src/filesystem/filesystemImpl.h
index 22b0be69..a5f013dc 100644
--- a/src/filesystem/filesystemImpl.h
+++ b/src/filesystem/filesystemImpl.h
@@ -30,10 +30,8 @@ std::string contentsOfAssetAsString(const char *baseName, const char *ext);
 
 std::string getResourcePath();
 
-#ifdef MKXPZ_DEBUG
 std::string selectPath(SDL_Window *win, const char *msg, const char *prompt);
 #endif
-#endif
 
 };
 #endif /* filesystemImpl_h */
diff --git a/src/filesystem/filesystemImplApple.mm b/src/filesystem/filesystemImplApple.mm
index 91221f45..63141e29 100644
--- a/src/filesystem/filesystemImplApple.mm
+++ b/src/filesystem/filesystemImplApple.mm
@@ -5,12 +5,8 @@
 //  Created by ゾロアーク on 11/21/20.
 //
 
-#ifdef MKXPZ_DEBUG
 #import <AppKit/AppKit.h>
 #import <SDL_syswm.h>
-#else
-#import <Foundation/Foundation.h>
-#endif
 
 #import <SDL_filesystem.h>
 
@@ -100,7 +96,6 @@ std::string filesystemImpl::getResourcePath() {
     return std::string(NSTOPATH(NSBundle.mainBundle.resourcePath));
 }
 
-#ifdef MKXPZ_DEBUG
 std::string filesystemImpl::selectPath(SDL_Window *win, const char *msg, const char *prompt) {
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     panel.canChooseDirectories = true;
@@ -126,4 +121,3 @@ std::string filesystemImpl::selectPath(SDL_Window *win, const char *msg, const c
     
     return std::string();
 }
-#endif
diff --git a/src/main.cpp b/src/main.cpp
index fc34488b..8fc32b85 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -344,18 +344,19 @@ int main(int argc, char *argv[]) {
       return 0;
     }
     
-#if defined(MKXPZ_BUILD_XCODE) && defined(MKXPZ_DEBUG)
-#define DEBUG_FSELECT_MSG "Select the folder to load game files from. This is the folder containing the INI and/or configuration JSON.\nThis prompt does not appear in release builds."
+#if defined(MKXPZ_BUILD_XCODE)
+#define DEBUG_FSELECT_MSG "Select the folder to load game files from. This is the folder containing the INI and/or configuration JSON."
 #define DEBUG_FSELECT_PROMPT "Load Game"
-    std::string dataDirStr = mkxp_fs::selectPath(win, DEBUG_FSELECT_MSG, DEBUG_FSELECT_PROMPT);
-    if (!dataDirStr.empty()) {
-        conf.gameFolder = dataDirStr;
-        mkxp_fs::setCurrentDirectory(dataDirStr.c_str());
-        Debug() << "DEBUG: Current directory set to" << dataDirStr;
-        conf.read(argc, argv);
-        conf.readGameINI();
+    if (SDL_getenv("MKXPZ_SELECT_PATH")) {
+        std::string dataDirStr = mkxp_fs::selectPath(win, DEBUG_FSELECT_MSG, DEBUG_FSELECT_PROMPT);
+        if (!dataDirStr.empty()) {
+            conf.gameFolder = dataDirStr;
+            mkxp_fs::setCurrentDirectory(dataDirStr.c_str());
+            Debug() << "DEBUG: Current directory set to" << dataDirStr;
+            conf.read(argc, argv);
+            conf.readGameINI();
+        }
     }
-    
 #endif
 
     /* OSX and Windows have their own native ways of