diff options
| author | rtk0c <[email protected]> | 2021-11-12 13:34:50 -0800 |
|---|---|---|
| committer | rtk0c <[email protected]> | 2021-11-12 13:34:50 -0800 |
| commit | 4932f36da4fab3fc8965822bba473cbd20f7f405 (patch) | |
| tree | 7317eaacb0d64de183a2bdce8e07d7120c29e5de /core/CMakeLists.txt | |
| parent | 816bbe7993adf4a41ace7bae06bfe6a5921308b8 (diff) | |
Fix compile errors under MSVC, remove PLATFORM_* macros in favor of compiler builtin macros, and add win32 support to FileStream
Diffstat (limited to 'core/CMakeLists.txt')
| -rw-r--r-- | core/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 346713d..9885886 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -17,7 +17,7 @@ elseif(APPLE) endif() macro(add_source_group GROUP_NAME) - list(APPEND CPLT_CORE_SOURCES ${ARGN}) + list(APPEND CPLT_CORE_SOURCES ${ARGN}) set_source_files_properties(${ARGN} PROPERTIES UNITY_GROUP "${GROUP_NAME}" @@ -85,12 +85,15 @@ list(APPEND CPLT_CORE_SOURCES # UI add_source_group(Utils src/Utils/IO/Archive.cpp src/Utils/IO/DataStream.cpp - src/Utils/IO/FileStream.cpp src/Utils/Sigslot.cpp src/Utils/StandardDirectories.cpp src/Utils/Time.cpp ) +list(APPEND CPLT_CORE_SOURCES + src/Utils/IO/FileStream.cpp +) + function(add_executable_variant TARGET_NAME) message("CpltCore: generating executable ${TARGET_NAME}") @@ -122,12 +125,6 @@ function(add_executable_variant TARGET_NAME) implot imgui-node-editor ) - target_compile_definitions(${TARGET_NAME} - PRIVATE - PLATFORM_WIN32=$<BOOL:${WIN32}> - PLATFORM_MACOS=$<BOOL:${APPLE}> - PLATFORM_LINUX=$<BOOL:${LINUX}> - ) if(NOT TARGET_LOCALE STREQUAL "en_US") target_compile_definitions(${TARGET_NAME} |