diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5de867942..0f1be940a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,6 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebInfo;Release" CACHE STRING "" FOR
 
 include("${CMAKE_SOURCE_DIR}/Tools/CMake/torque_macros.cmake")
 include("${CMAKE_SOURCE_DIR}/Tools/CMake/torque_configs.cmake")
-file(GLOB OS_SCRIPTS "${CMAKE_SOURCE_DIR}/Tools/CMake/torque*configs.cmake")
-foreach (TORQUE_OS_SCRIPT ${OS_SCRIPTS})
-    include(${TORQUE_OS_SCRIPT})
-endforeach() 
 
 # Ensure multi-core compilation is enabled for everything
 add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
@@ -74,4 +70,8 @@ endif(NOT TORQUE_INSTALLED_TEMPLATE)
 # Generate torqueConfig.h in our temp directory
 configure_file("${CMAKE_SOURCE_DIR}/Tools/CMake/torqueConfig.h.in" "${TORQUE_APP_ROOT_DIRECTORY}/source/torqueConfig.h")
 
+if(APPLE)
+include("${CMAKE_SOURCE_DIR}/Tools/CMake/torqueMacOSconfigs.cmake")
+endif(APPLE)
+
 add_subdirectory(Engine)
diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt
index aad4df349..10d600012 100644
--- a/Engine/source/CMakeLists.txt
+++ b/Engine/source/CMakeLists.txt
@@ -366,6 +366,12 @@ if (APPLE)
   MACOSX_BUNDLE_INFO_PLIST "${TORQUE_APP_ROOT_DIRECTORY}/source/Info.plist"
   XCODE_ATTRIBUTE_INSTALL_PATH "/Applications"
   XCODE_ATTRIBUTE_SKIP_INSTALL "No"
+  XCODE_ATTRIBUTE_LINKER_DISPLAYS_MANGLED_NAMES[variant=Debug] YES
+  XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] YES
+  XCODE_ATTRIBUTE_ENABLE_TESTABILITY[variant=Debug] YES
+  XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=Debug] parent
+  XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=RelWithDebInfo] parent
+  XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=Release] resource
   MACOSX_RPATH TRUE)
 
 elseif (WIN32)
diff --git a/Tools/CMake/Info.plist.in b/Tools/CMake/Info.plist.in
index 0c6657131..cfe6d5943 100644
--- a/Tools/CMake/Info.plist.in
+++ b/Tools/CMake/Info.plist.in
@@ -17,6 +17,6 @@
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
     <key>SDL_FILESYSTEM_BASE_DIR_TYPE</key>
-    <string>resource</string>
+    <string>$(SDL_FILE_DIR)</string>
 </dict>
 </plist>
diff --git a/Tools/CMake/torqueMacOSconfigs.cmake b/Tools/CMake/torqueMacOSconfigs.cmake
index 0e583d0b4..a0b3c42db 100644
--- a/Tools/CMake/torqueMacOSconfigs.cmake
+++ b/Tools/CMake/torqueMacOSconfigs.cmake
@@ -48,7 +48,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "11" CACHE STRING "" FORCE)
 set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "" FORCE)
 set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET[arch=arm64] "11.0" CACHE STRING "arm 64 minimum deployment target" FORCE)
 set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx)
-set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
 set(CMAKE_SYSTEM_NAME Darwin)
 
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)