MacOS: Fix link issue with cmake xcode generator

EasyRPG · Nov 16, 2023 · d9dc94c · d9dc94c
1 parent 74132d7
commit d9dc94c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git 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)
@@ -668,8 +668,8 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "wii")
 		src/platform/wii/clock.cpp
 		src/platform/wii/clock.h
 		src/platform/wii/input_buttons.cpp
-		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)
@@ -681,8 +681,8 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "amigaos4")
 	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=1)
 	target_include_directories(${PROJECT_NAME} PUBLIC ${SDL_INCLUDE_DIR})
 	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/Makefile.am b/Makefile.am
@@ -443,8 +443,8 @@ libeasyrpg_player_a_SOURCES = \
 SOURCEFILES_SDL2 = \
 	src/platform/sdl/sdl2_ui.cpp \
 	src/platform/sdl/sdl2_ui.h \
-	src/platform/sdl/audio.cpp \
-	src/platform/sdl/audio.h
+	src/platform/sdl/sdl_audio.cpp \
+	src/platform/sdl/sdl_audio.h
 if HAVE_SDL2
 libeasyrpg_player_a_SOURCES += $(SOURCEFILES_SDL2)
 else
@@ -454,8 +454,8 @@ endif
 SOURCEFILES_SDL1 = \
 	src/platform/sdl/sdl_ui.cpp \
 	src/platform/sdl/sdl_ui.h \
-	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
 if HAVE_SDL1
 libeasyrpg_player_a_SOURCES += $(SOURCEFILES_SDL1)
@@ -493,8 +493,8 @@ EXTRA_DIST += $(SOURCEFILES_ALSA)
 endif
 
 SOURCEFILES_MACOS = \
-	src/platform/macos/utils.h \
-	src/platform/macos/utils.mm \
+	src/platform/macos/macos_utils.h \
+	src/platform/macos/macos_utils.mm \
 	src/platform/macos/midiout_device_coreaudio.cpp \
 	src/platform/macos/midiout_device_coreaudio.h
 if MACOS

diff --git 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 → src/platform/macos/macos_utils.h b/src/platform/macos/utils.h → src/platform/macos/macos_utils.h
diff --git a/src/platform/macos/utils.mm → src/platform/macos/macos_utils.mm b/src/platform/macos/utils.mm → 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
@@ -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 → src/platform/sdl/sdl_audio.cpp b/src/platform/sdl/audio.cpp → 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 → src/platform/sdl/sdl_audio.h b/src/platform/sdl/audio.h → src/platform/sdl/sdl_audio.h
diff --git 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_;