WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Improve CMake macOS build

Browse Source 
Now actually builds on macOS.

Closes #9
This commit is contained in:
Ryan Schmidt
2022-03-16 23:46:19 -05:00
parent d470bb5eeb
commit e78b01a5f3
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AerofoilX/GpMain_SDL_X.cpp
View File

@@ -20,7 +20,9 @@
#include "IGpVOSEventQueue.h" #include "IGpVOSEventQueue.h"
#include <string> #include <string>
#ifdef __MACOS__
#include "MacInit.h" #include "MacInit.h"
#endif
GpXGlobals g_gpXGlobals; GpXGlobals g_gpXGlobals;

32
CMakeLists.txt
View File

@@ -45,6 +45,7 @@ add_library(PortabilityLayer STATIC
PortabilityLayer/BitmapImage.cpp PortabilityLayer/BitmapImage.cpp
PortabilityLayer/ByteSwap.cpp PortabilityLayer/ByteSwap.cpp
PortabilityLayer/CFileStream.cpp PortabilityLayer/CFileStream.cpp
PortabilityLayer/CompositeRenderedFont.cpp
PortabilityLayer/DeflateCodec.cpp PortabilityLayer/DeflateCodec.cpp
PortabilityLayer/DialogManager.cpp PortabilityLayer/DialogManager.cpp
PortabilityLayer/DisplayDeviceManager.cpp PortabilityLayer/DisplayDeviceManager.cpp
@@ -240,7 +241,8 @@ target_include_directories(GpApp PRIVATE
target_link_libraries(GpApp PortabilityLayer) target_link_libraries(GpApp PortabilityLayer)
if(CMAKE_HOST_UNIX) if(CMAKE_HOST_UNIX)
add_executable(${EXECNAME} set(EXEC_SOURCES )
list(APPEND EXEC_SOURCES
AerofoilPortable/GpSystemServices_POSIX.cpp AerofoilPortable/GpSystemServices_POSIX.cpp
AerofoilPortable/GpThreadEvent_Cpp11.cpp AerofoilPortable/GpThreadEvent_Cpp11.cpp
AerofoilPortable/GpAllocator_C.cpp AerofoilPortable/GpAllocator_C.cpp
@@ -257,8 +259,16 @@ if(CMAKE_HOST_UNIX)
AerofoilX/GpSystemServices_X.cpp AerofoilX/GpSystemServices_X.cpp
AerofoilX/GpFileSystem_X.cpp AerofoilX/GpFileSystem_X.cpp
) )
target_include_directories(${EXECNAME} PRIVATE set(EXEC_LIBS )
list(APPEND EXEC_LIBS
${SDL2_LIBRARIES}
GpApp
GpShell
)
set(EXEC_INC_DIRS )
list(APPEND EXEC_INC_DIRS
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpShell> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpShell>
@@ -267,8 +277,22 @@ if(CMAKE_HOST_UNIX)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}
) )
if(PLATFORM STREQUAL "MAC")
list(APPEND EXEC_SOURCES
AerofoilMac/AerofoilMac/AerofoilApplication.mm
AerofoilMac/AerofoilMac/MacInit.mm
)
list(APPEND EXEC_INC_DIRS
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilMac/AerofoilMac>
)
list(APPEND EXEC_LIBS
"-framework Cocoa"
)
endif(PLATFORM STREQUAL "MAC")
target_link_libraries(${EXECNAME} ${SDL2_LIBRARIES} GpApp GpShell) add_executable(${EXECNAME} ${EXEC_SOURCES})
target_include_directories(${EXECNAME} PRIVATE ${EXEC_INC_DIRS})
target_link_libraries(${EXECNAME} ${EXEC_LIBS})
endif() endif()