From 4932f36da4fab3fc8965822bba473cbd20f7f405 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 12 Nov 2021 13:34:50 -0800 Subject: Fix compile errors under MSVC, remove PLATFORM_* macros in favor of compiler builtin macros, and add win32 support to FileStream --- core/CMakeLists.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'core/CMakeLists.txt') 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=$ - PLATFORM_MACOS=$ - PLATFORM_LINUX=$ - ) if(NOT TARGET_LOCALE STREQUAL "en_US") target_compile_definitions(${TARGET_NAME} -- cgit v1.2.3-70-g09d2