diff options
| author | crupest <crupest@outlook.com> | 2022-05-13 22:52:25 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-05-13 22:52:25 +0800 |
| commit | 8cb4c5bf9e3eb0ba01679355a445369dd61122df (patch) | |
| tree | 84a1ee599fd9b4373193b09a446bc0c7612f0726 | |
| parent | 7a0779adf3c31951de623862d9f85d62a679f03d (diff) | |
| download | cru-8cb4c5bf9e3eb0ba01679355a445369dd61122df.tar.gz cru-8cb4c5bf9e3eb0ba01679355a445369dd61122df.tar.bz2 cru-8cb4c5bf9e3eb0ba01679355a445369dd61122df.zip | |
...
| -rw-r--r-- | src/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/platform/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/platform/bootstrap/Bootstrap.cpp | 4 | ||||
| -rw-r--r-- | src/platform/bootstrap/CMakeLists.txt | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 043ee5ea..75b91838 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -22,6 +22,10 @@ if (UNIX) platform/unix/ErrnoException.cpp platform/unix/UnixFileStream.cpp ) + + if (NOT APPLE) + target_link_libraries(cru_base PUBLIC pthread) + endif() endif() if (APPLE) diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt index fbca4205..c3f62535 100644 --- a/src/platform/CMakeLists.txt +++ b/src/platform/CMakeLists.txt @@ -9,8 +9,4 @@ target_compile_definitions(cru_platform_base PRIVATE CRU_PLATFORM_EXPORT_API) add_subdirectory(graphics) add_subdirectory(gui) -if(WIN32) - add_subdirectory(bootstrap) -elseif(APPLE) - add_subdirectory(bootstrap) -endif() +add_subdirectory(bootstrap) diff --git a/src/platform/bootstrap/Bootstrap.cpp b/src/platform/bootstrap/Bootstrap.cpp index cdbd14f1..a32cbb65 100644 --- a/src/platform/bootstrap/Bootstrap.cpp +++ b/src/platform/bootstrap/Bootstrap.cpp @@ -14,6 +14,8 @@ cru::platform::gui::IUiApplication* CreateUiApplication() { return new cru::platform::gui::win::WinUiApplication(); #elif CRU_PLATFORM_OSX return new cru::platform::gui::osx::OsxUiApplication(); +#else + return nullptr; #endif } @@ -23,6 +25,8 @@ CreateGraphicsFactory() { return new cru::platform::graphics::win::direct::DirectGraphicsFactory(); #elif CRU_PLATFORM_OSX return new cru::platform::graphics::osx::quartz::QuartzGraphicsFactory(); +#else + return nullptr; #endif } diff --git a/src/platform/bootstrap/CMakeLists.txt b/src/platform/bootstrap/CMakeLists.txt index 4c8e0959..6df73f38 100644 --- a/src/platform/bootstrap/CMakeLists.txt +++ b/src/platform/bootstrap/CMakeLists.txt @@ -6,6 +6,8 @@ if(WIN32) target_link_libraries(cru_platform_bootstrap PUBLIC cru_win_gui) elseif(APPLE) target_link_libraries(cru_platform_bootstrap PUBLIC cru_osx_gui) +else() + target_link_libraries(cru_platform_bootstrap PUBLIC cru_platform_graphics_cairo) endif() target_compile_definitions(cru_platform_bootstrap PRIVATE CRU_PLATFORM_BOOTSTRAP_EXPORT_API) |