From deb1a01bac6d43d5d9a3d6a550383dcaa5b913cf Mon Sep 17 00:00:00 2001
From: Tyrone Trevorrow <819705+tyrone-sudeium@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:17:32 +1100
Subject: [PATCH] MacOS: Fix link issue with cmake xcode generator

---
 CMakeLists.txt                                  | 12 ++++++------
 src/main_data.cpp                               |  2 +-
 src/platform/macos/{utils.h => macos_utils.h}   |  0
 src/platform/macos/{utils.mm => macos_utils.mm} |  2 +-
 src/platform/sdl/sdl2_ui.cpp                    |  4 ++--
 src/platform/sdl/{audio.cpp => sdl_audio.cpp}   |  2 +-
 src/platform/sdl/{audio.h => sdl_audio.h}       |  0
 src/platform/sdl/sdl_ui.cpp                     |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename src/platform/macos/{utils.h => macos_utils.h} (100%)
 rename src/platform/macos/{utils.mm => macos_utils.mm} (97%)
 rename src/platform/sdl/{audio.cpp => sdl_audio.cpp} (99%)
 rename src/platform/sdl/{audio.h => sdl_audio.h} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 688eb2d970e..e17c9cbbc70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -551,8 +551,8 @@ endif()
 
 if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 	target_sources(${PROJECT_NAME} PRIVATE
-		src/platform/sdl/audio.cpp
-		src/platform/sdl/audio.h
+		src/platform/sdl/sdl_audio.cpp
+		src/platform/sdl/sdl_audio.h
 		src/platform/sdl/sdl2_ui.cpp
 		src/platform/sdl/sdl2_ui.h)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=2)
@@ -574,8 +574,8 @@ if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 	endif()
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL1")
 	target_sources(${PROJECT_NAME} PRIVATE
-		src/platform/sdl/audio.cpp
-		src/platform/sdl/audio.h
+		src/platform/sdl/sdl_audio.cpp
+		src/platform/sdl/sdl_audio.h
 		src/platform/sdl/axis.h
 		src/platform/sdl/sdl_ui.cpp
 		src/platform/sdl/sdl_ui.h)
@@ -753,8 +753,8 @@ endif()
 
 if(APPLE)
 	target_sources(${PROJECT_NAME} PRIVATE
-		src/platform/macos/utils.mm
-		src/platform/macos/utils.h
+		src/platform/macos/macos_utils.mm
+		src/platform/macos/macos_utils.h
 		src/platform/macos/midiout_device_coreaudio.cpp
 		src/platform/macos/midiout_device_coreaudio.h)
 
diff --git a/src/main_data.cpp b/src/main_data.cpp
index 8a57dd79fff..86d4a8cc31c 100644
--- a/src/main_data.cpp
+++ b/src/main_data.cpp
@@ -49,7 +49,7 @@
 #  include <SDL_system.h>
 #elif defined(__APPLE__) && TARGET_OS_OSX
 #  include <sys/syslimits.h>
-#  include "platform/macos/utils.h"
+#  include "platform/macos/macos_utils.h"
 #endif
 
 // Global variables.
diff --git a/src/platform/macos/utils.h b/src/platform/macos/macos_utils.h
similarity index 100%
rename from src/platform/macos/utils.h
rename to src/platform/macos/macos_utils.h
diff --git a/src/platform/macos/utils.mm b/src/platform/macos/macos_utils.mm
similarity index 97%
rename from src/platform/macos/utils.mm
rename to src/platform/macos/macos_utils.mm
index 53ca53ea770..5f6745118f9 100644
--- a/src/platform/macos/utils.mm
+++ b/src/platform/macos/macos_utils.mm
@@ -22,7 +22,7 @@
 #ifdef __APPLE__
 #import <Foundation/Foundation.h>
 #include <string>
-#include "platform/macos/utils.h"
+#include "platform/macos/macos_utils.h"
 
 bool MacOSUtils::IsAppBundle() {
 	bool is_bundle = false;
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 97416c953ac..f51d3b0942b 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -42,10 +42,10 @@
 #include "lcf/scope_guard.h"
 
 #ifdef SUPPORT_AUDIO
-#  include "audio.h"
+#  include "sdl_audio.h"
 
 #  if defined(__APPLE__) && TARGET_OS_OSX
-#    include "platform/macos/utils.h"
+#    include "platform/macos/macos_utils.h"
 #  endif
 
 
diff --git a/src/platform/sdl/audio.cpp b/src/platform/sdl/sdl_audio.cpp
similarity index 99%
rename from src/platform/sdl/audio.cpp
rename to src/platform/sdl/sdl_audio.cpp
index ffab5f4a844..c5430278818 100644
--- a/src/platform/sdl/audio.cpp
+++ b/src/platform/sdl/sdl_audio.cpp
@@ -30,7 +30,7 @@
 #  include <emscripten.h>
 #endif
 
-#include "audio.h"
+#include "sdl_audio.h"
 #include "output.h"
 
 using namespace std::chrono_literals;
diff --git a/src/platform/sdl/audio.h b/src/platform/sdl/sdl_audio.h
similarity index 100%
rename from src/platform/sdl/audio.h
rename to src/platform/sdl/sdl_audio.h
diff --git a/src/platform/sdl/sdl_ui.cpp b/src/platform/sdl/sdl_ui.cpp
index 1019fa7ea9a..dc8cee1b423 100644
--- a/src/platform/sdl/sdl_ui.cpp
+++ b/src/platform/sdl/sdl_ui.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef SUPPORT_AUDIO
-#  include "audio.h"
+#  include "sdl_audio.h"
 
 AudioInterface& SdlUi::GetAudio() {
 	return *audio_;