diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/base/platform/win/Base.cpp (renamed from src/base/platform/win/Exception.cpp) | 2 | ||||
| -rw-r--r-- | src/base/platform/win/BrigdeComStream.h | 3 | ||||
| -rw-r--r-- | src/base/platform/win/ComAutoInit.cpp | 1 | ||||
| -rw-r--r-- | src/base/platform/win/StreamConvert.cpp | 2 | ||||
| -rw-r--r-- | src/base/platform/win/Win32FileStream.cpp | 1 | ||||
| -rw-r--r-- | src/base/platform/win/Win32FileStreamPrivate.h | 2 |
7 files changed, 8 insertions, 11 deletions
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index aa9a8a6b..5892c136 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -52,14 +52,17 @@ endif() if (WIN32) target_sources(CruBase PRIVATE + platform/win/Base.cpp platform/win/BridgeComStream.cpp platform/win/ComAutoInit.cpp platform/win/DebugLogTarget.cpp - platform/win/Exception.cpp platform/win/StreamConvert.cpp platform/win/Win32FileStream.cpp ) - + target_compile_definitions(CruBase PUBLIC + UNICODE _UNICODE + _CRT_SECURE_NO_WARNINGS + ) target_link_libraries(CruBase PUBLIC Shlwapi.lib) endif() @@ -70,7 +73,6 @@ endif() if (WIN32) target_compile_definitions(CruBase PUBLIC CRU_PLATFORM_WINDOWS - _CRT_SECURE_NO_WARNINGS ) elseif(APPLE) target_compile_definitions(CruBase PUBLIC diff --git a/src/base/platform/win/Exception.cpp b/src/base/platform/win/Base.cpp index adc59e3c..5edf9779 100644 --- a/src/base/platform/win/Exception.cpp +++ b/src/base/platform/win/Base.cpp @@ -1,4 +1,4 @@ -#include "cru/base/platform/win/Exception.h" +#include "cru/base/platform/win/Base.h" #include <format> #include <optional> diff --git a/src/base/platform/win/BrigdeComStream.h b/src/base/platform/win/BrigdeComStream.h index 1621b567..ee189433 100644 --- a/src/base/platform/win/BrigdeComStream.h +++ b/src/base/platform/win/BrigdeComStream.h @@ -1,6 +1,5 @@ #pragma once -#include "cru/base/platform/win/WinPreConfig.h" - +#include "cru/base/platform/win/Base.h" #include "cru/base/io/Stream.h" #include <objidlbase.h> diff --git a/src/base/platform/win/ComAutoInit.cpp b/src/base/platform/win/ComAutoInit.cpp index 548a7bea..75ced601 100644 --- a/src/base/platform/win/ComAutoInit.cpp +++ b/src/base/platform/win/ComAutoInit.cpp @@ -1,5 +1,4 @@ #include "cru/base/platform/win/ComAutoInit.h" -#include "cru/base/platform/win/Exception.h" #include <combaseapi.h> diff --git a/src/base/platform/win/StreamConvert.cpp b/src/base/platform/win/StreamConvert.cpp index e0266765..cb353fd3 100644 --- a/src/base/platform/win/StreamConvert.cpp +++ b/src/base/platform/win/StreamConvert.cpp @@ -2,9 +2,7 @@ #include "BrigdeComStream.h" #include "Win32FileStreamPrivate.h" #include "cru/base/io/MemoryStream.h" -#include "cru/base/io/OpenFileFlag.h" #include "cru/base/platform/win/ComAutoInit.h" -#include "cru/base/platform/win/Exception.h" #include "cru/base/platform/win/Win32FileStream.h" #include <shlwapi.h> diff --git a/src/base/platform/win/Win32FileStream.cpp b/src/base/platform/win/Win32FileStream.cpp index 618ce386..96a3dc67 100644 --- a/src/base/platform/win/Win32FileStream.cpp +++ b/src/base/platform/win/Win32FileStream.cpp @@ -3,7 +3,6 @@ #include "Win32FileStreamPrivate.h" #include "cru/base/StringUtil.h" #include "cru/base/io/OpenFileFlag.h" -#include "cru/base/platform/win/Exception.h" #include <Windows.h> #include <coml2api.h> diff --git a/src/base/platform/win/Win32FileStreamPrivate.h b/src/base/platform/win/Win32FileStreamPrivate.h index 718f8d9a..c49fa913 100644 --- a/src/base/platform/win/Win32FileStreamPrivate.h +++ b/src/base/platform/win/Win32FileStreamPrivate.h @@ -1,4 +1,4 @@ -#include "cru/base/platform/win/WinPreConfig.h" +#include "cru/base/platform/win/Base.h" #include <objidl.h> |