Move SH_OpenAL stuff to its own CMakeLists.txt

This commit is contained in:
Jean-Philip Desjardins 2018-10-18 18:46:41 -04:00
parent 1959ee9c23
commit d543d4049b
5 changed files with 49 additions and 33 deletions

View File

@ -24,14 +24,13 @@ if(NOT TARGET gsh_opengl)
endif()
list(INSERT PROJECT_LIBS 0 gsh_opengl)
if(NOT TARGET Framework_OpenAl)
if(NOT TARGET sh_openal)
add_subdirectory(
${CMAKE_CURRENT_SOURCE_DIR}/../../../Framework/build_cmake/FrameworkOpenAl
${CMAKE_CURRENT_BINARY_DIR}/FrameworkOpenAl
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/PsfPlayer/Source/SH_OpenAL
${CMAKE_CURRENT_BINARY_DIR}/SH_OpenAL
)
endif()
list(APPEND PROJECT_LIBS Framework_OpenAl)
find_package(OpenAL REQUIRED)
endif()
list(APPEND PROJECT_LIBS sh_openal)
if(NOT TARGET iCade_Static)
add_subdirectory(
@ -72,7 +71,6 @@ set(OSX_SOURCES
VirtualPadItem.mm
VirtualPadStick.mm
VirtualPadView.mm
../../tools/PsfPlayer/Source/SH_OpenAL.cpp
)
set(OSX_HEADERS

View File

@ -41,15 +41,13 @@ if(TARGET_PLATFORM_UNIX)
endif()
if(TARGET_PLATFORM_MACOS OR TARGET_PLATFORM_UNIX)
if(NOT TARGET Framework_OpenAl)
if(NOT TARGET sh_openal)
add_subdirectory(
${CMAKE_CURRENT_SOURCE_DIR}/../../../Framework/build_cmake/FrameworkOpenAl
${CMAKE_CURRENT_BINARY_DIR}/FrameworkOpenAl
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/PsfPlayer/Source/SH_OpenAL
${CMAKE_CURRENT_BINARY_DIR}/SH_OpenAL
)
endif()
list(APPEND PROJECT_LIBS Framework_OpenAl)
find_package(OpenAL REQUIRED)
list(APPEND PROJECT_LIBS ${OPENAL_LIBRARY})
list(APPEND PROJECT_LIBS sh_openal)
endif()
set(QT_SOURCES
@ -105,12 +103,6 @@ if(LIBEVDEV_FOUND)
GamePad/GamePadDeviceListener.h
)
endif()
if(OPENAL_FOUND)
set(QT_SOURCES
${QT_SOURCES}
../../tools/PsfPlayer/Source/SH_OpenAL.cpp
)
endif()
if(TARGET_PLATFORM_WIN32)
set(QT_SOURCES
${QT_SOURCES}

View File

@ -22,20 +22,6 @@ if(NOT TARGET PlayCore)
endif()
list(APPEND PROJECT_LIBS PlayCore)
find_package(OpenAL)
if(OPENAL_FOUND)
if(TARGET_PLATFORM_MACOS OR TARGET_PLATFORM_IOS OR TARGET_PLATFORM_UNIX OR TARGET_PLATFORM_WIN32)
if(NOT TARGET Framework_OpenAl)
add_subdirectory(
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Framework/build_cmake/FrameworkOpenAl
${CMAKE_CURRENT_BINARY_DIR}/FrameworkOpenAl
)
endif()
list(APPEND PROJECT_LIBS Framework_OpenAl)
list(APPEND PROJECT_LIBS ${OPENAL_LIBRARY})
endif()
endif()
if(PSF_RAR_SUPPORT)
if(NOT TARGET unrar)
add_subdirectory(

View File

@ -0,0 +1,32 @@
cmake_minimum_required(VERSION 3.5)
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
${CMAKE_MODULE_PATH}
)
include(Header)
project(SH_OpenAL)
if(NOT TARGET Framework)
add_subdirectory(
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Framework/build_cmake/Framework
${CMAKE_CURRENT_BINARY_DIR}/Framework
)
endif()
list(APPEND PROJECT_LIBS Framework)
if(NOT TARGET Framework_OpenAl)
add_subdirectory(
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Framework/build_cmake/FrameworkOpenAl
${CMAKE_CURRENT_BINARY_DIR}/FrameworkOpenAl
)
endif()
list(APPEND PROJECT_LIBS Framework_OpenAl)
add_library(sh_openal STATIC
../SH_OpenAL.cpp
../SH_OpenAL.h
)
target_link_libraries(sh_openal ${PROJECT_LIBS})

View File

@ -18,6 +18,14 @@ if(NOT TARGET PsfCore)
endif()
list(APPEND PROJECT_LIBS PsfCore)
if(NOT TARGET sh_openal)
add_subdirectory(
${CMAKE_CURRENT_SOURCE_DIR}/../SH_OpenAL
${CMAKE_CURRENT_BINARY_DIR}/SH_OpenAL
)
endif()
list(APPEND PROJECT_LIBS sh_openal)
find_library(UIKIT_LIBRARY NAMES UIKit)
find_library(AVFOUNDATION_LIBRARY NAMES AVFoundation)
find_library(COREGRAPHICS_LIBRARY NAMES CoreGraphics)