Merge faf4ef2cf2 into e2f3ae66f8

.gitignore

@@ -266,7 +266,7 @@ __pycache__/
 /Export
 /DrMem
 /Doc private
-# Windows local libraries
+# Windows and macOS local libraries
 /Libs
 
 #CMake generated

CMakeLists.txt

@@ -24,6 +24,8 @@ if(APPLE)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH true)
     set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+    list(APPEND SDL2_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs")
+    list(APPEND SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs")
 endif()
 
 # SDL2main is not needed

CMakeModules/FindSDL2.cmake

@@ -77,7 +77,6 @@ SET(SDL2_SEARCH_PATHS
 	/opt/csw # Blastwave
 	/opt
 	${SDL2_PATH}
-	${CMAKE_SOURCE_DIR}/extern
 )
 
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h

CMakeModules/FindSDL2_mixer.cmake

@@ -42,11 +42,6 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-SET(SDL2_MIXER_SEARCH_PATHS
-    ${SDL2_MIXER_PATH}
-    ${CMAKE_SOURCE_DIR}/extern
-)
-
 find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
         HINTS
         ENV SDL2MIXERDIR
@@ -54,7 +49,7 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
         PATH_SUFFIXES SDL2
         # path suffixes to search inside ENV{SDLDIR}
         include/SDL2 include
-        PATHS ${SDL2_MIXER_SEARCH_PATHS}
+        PATHS ${SDL2_MIXER_PATH}
         )
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -69,7 +64,7 @@ find_library(SDL2_MIXER_LIBRARY
         ENV SDL2MIXERDIR
         ENV SDL2DIR
         PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX}
-        PATHS ${SDL2_MIXER_SEARCH_PATHS}
+        PATHS ${SDL2_MIXER_PATH}
         )
 
 if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")

build-mac-app.sh

@@ -2,9 +2,9 @@
 
 set -xe
 
-mkdir extern
+mkdir -p Libs
 
-cd extern
+cd Libs
 
 sdl_version='2.28.1'
 sdl_filename="SDL2-$sdl_version.dmg"
@@ -47,8 +47,8 @@ mkdir -p SpaceCadetPinball.app/Contents/Frameworks
 
 cp -a Platform/macOS/Info.plist SpaceCadetPinball.app/Contents/
 cp -a Platform/macOS/SpaceCadetPinball.icns SpaceCadetPinball.app/Contents/Resources/
-cp -a extern/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/
-cp -a extern/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/
+cp -a Libs/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/
+cp -a Libs/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/
 cp -a bin/SpaceCadetPinball SpaceCadetPinball.app/Contents/MacOS/
 
 sed -i '' "s/CHANGEME_SW_VERSION/$sw_version/" SpaceCadetPinball.app/Contents/Info.plist