diff --git a/.gitignore b/.gitignore
index f83ee98..d81cc3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,7 +266,7 @@ __pycache__/
 /Export
 /DrMem
 /Doc private
-# Windows and macOS local libraries
+# Windows local libraries
 /Libs
 
 #CMake generated
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e5ef0..4d77ee6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,6 @@ 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
diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake
index dfaaa17..91181c4 100644
--- a/CMakeModules/FindSDL2.cmake
+++ b/CMakeModules/FindSDL2.cmake
@@ -77,6 +77,7 @@ SET(SDL2_SEARCH_PATHS
 	/opt/csw # Blastwave
 	/opt
 	${SDL2_PATH}
+	${CMAKE_SOURCE_DIR}/extern
 )
 
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h
diff --git a/CMakeModules/FindSDL2_mixer.cmake b/CMakeModules/FindSDL2_mixer.cmake
index 9bf2719..dc052a8 100644
--- a/CMakeModules/FindSDL2_mixer.cmake
+++ b/CMakeModules/FindSDL2_mixer.cmake
@@ -42,6 +42,11 @@
 # (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
@@ -49,7 +54,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_PATH}
+        PATHS ${SDL2_MIXER_SEARCH_PATHS}
         )
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -64,7 +69,7 @@ find_library(SDL2_MIXER_LIBRARY
         ENV SDL2MIXERDIR
         ENV SDL2DIR
         PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX}
-        PATHS ${SDL2_MIXER_PATH}
+        PATHS ${SDL2_MIXER_SEARCH_PATHS}
         )
 
 if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")
diff --git a/build-mac-app.sh b/build-mac-app.sh
old mode 100755
new mode 100644
index dbd1998..a77a492
--- a/build-mac-app.sh
+++ b/build-mac-app.sh
@@ -2,9 +2,9 @@
 
 set -xe
 
-mkdir -p Libs
+mkdir extern
 
-cd Libs
+cd extern
 
 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 Libs/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/
-cp -a Libs/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/
+cp -a extern/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/
+cp -a extern/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