diff options
| -rw-r--r-- | .editorconfig | 2 | ||||
| -rw-r--r-- | demos/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | include/cru/common/String.hpp | 1 | ||||
| -rw-r--r-- | src/platform/CMakeLists.txt | 5 |
4 files changed, 6 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig index 10f91e46..d5a3daa2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ root = true [*] -end_of_line = crlf +end_of_line = lf insert_final_newline = true [*.cpp] diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 17a8fbed..f975a6e9 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -9,6 +9,6 @@ if(WIN32) # Currently only enable tests on Windows. add_subdirectory(input_method) endif() -if(UNIX) +if(UNIX AND NOT APPLE) add_subdirectory(xcb) endif() diff --git a/include/cru/common/String.hpp b/include/cru/common/String.hpp index c8defd13..79885aba 100644 --- a/include/cru/common/String.hpp +++ b/include/cru/common/String.hpp @@ -1,6 +1,5 @@ #pragma once -#include <vcruntime.h> #include "Base.hpp" #include <cstdint> diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt index f5f48795..e831c544 100644 --- a/src/platform/CMakeLists.txt +++ b/src/platform/CMakeLists.txt @@ -18,4 +18,7 @@ target_compile_definitions(cru_platform_base PRIVATE CRU_PLATFORM_EXPORT_API) add_subdirectory(graphics) add_subdirectory(gui) -add_subdirectory(bootstrap) + +if(WIN32) + add_subdirectory(bootstrap) +endif() |