Merge pull request #1847 from jvernet/master

MacOsX Compilation fixed
This commit is contained in:
Miran Grča
2021-11-19 17:14:07 +01:00
committed by GitHub
3 changed files with 24 additions and 11 deletions

View File

@@ -95,9 +95,12 @@ endif()
#some macOS specific configuration steps
if(APPLE)
# Force using the newest library if it's installed by homebrew
find_library(COCOA_LIBRARY Cocoa)
target_link_libraries (86Box ${COCOA_LIBRARY} )
# Force using the newest library if it's installed by homebrew
set(CMAKE_FIND_FRAMEWORK LAST)
# prepare stuff for macOS app bundles
set(CMAKE_MACOSX_BUNDLE 1)
@@ -224,7 +227,10 @@ add_subdirectory(sio)
add_subdirectory(scsi)
add_subdirectory(sound)
add_subdirectory(video)
if (WIN32)
if(APPLE)
add_subdirectory(mac)
add_subdirectory(unix)
elseif(WIN32)
add_subdirectory(win)
else()
add_subdirectory(unix)