diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-21 16:25:38 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-21 16:25:38 +0800 |
| commit | 99e4f282ba8df6dcaa3032fa1bfbb5f88884d9a6 (patch) | |
| tree | 43d40b7f1d7d44c0386de94ef7f29165772259c5 /indra/newview | |
| parent | b8e727b023876c34ae3b1fca0f598c8b2dbe4bcd (diff) | |
Darwin & any platform can, and should, use SDL
The alt mouse click to cam is broken for now on macOS,
but this is the path we've chosen.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 52a1712393..e345b55845 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1374,12 +1374,15 @@ set_source_files_properties( ) if (DARWIN) + if (NOT USESYSTEMLIBS) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.mm) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.h) + endif (NOT USESYSTEMLIBS) LIST(APPEND viewer_SOURCE_FILES llfilepicker_mac.mm) LIST(APPEND viewer_HEADER_FILES llfilepicker_mac.h) + if (NOT USESYSTEMLIBS) # This should be compiled with the viewer. LIST(APPEND viewer_SOURCE_FILES llappdelegate-objc.mm) set_source_files_properties( @@ -1394,6 +1397,7 @@ if (DARWIN) # warnings. COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness" ) + endif (NOT USESYSTEMLIBS) # Add resource files to the project. set(viewer_RESOURCE_FILES @@ -1920,6 +1924,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ll::bugsplat ll::tracy ll::libvlc + ll::fontconfig ) if( TARGET ll::intel_memops ) |