aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/cru/base/Base.h2
-rw-r--r--include/cru/base/PreConfig.h18
-rw-r--r--include/cru/base/platform/osx/Convert.h1
-rw-r--r--include/cru/base/platform/osx/Exception.h1
-rw-r--r--include/cru/base/platform/unix/PosixSpawnSubProcess.h2
-rw-r--r--include/cru/base/platform/unix/UnixFileStream.h2
-rw-r--r--include/cru/base/platform/unix/UnixPipe.h2
-rw-r--r--include/cru/base/platform/web/WebException.h2
-rw-r--r--include/cru/base/platform/win/ComAutoInit.h1
-rw-r--r--include/cru/base/platform/win/DebugLogTarget.h1
-rw-r--r--include/cru/base/platform/win/Exception.h5
-rw-r--r--include/cru/base/platform/win/StreamConvert.h1
-rw-r--r--include/cru/base/platform/win/Win32FileStream.h2
-rw-r--r--include/cru/base/platform/win/WinPreConfig.h1
-rw-r--r--src/base/CMakeLists.txt19
15 files changed, 19 insertions, 41 deletions
diff --git a/include/cru/base/Base.h b/include/cru/base/Base.h
index 8a6a7634..b0d304e4 100644
--- a/include/cru/base/Base.h
+++ b/include/cru/base/Base.h
@@ -1,6 +1,4 @@
#pragma once
-#include "PreConfig.h" // IWYU pragma: keep
-
#include <cassert>
#include <cstddef>
#include <functional>
diff --git a/include/cru/base/PreConfig.h b/include/cru/base/PreConfig.h
deleted file mode 100644
index 3f26c589..00000000
--- a/include/cru/base/PreConfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// IWYU pragma: always_keep
-
-#pragma once
-
-#ifdef _MSC_VER
-// disable the unnecessary warning about multi-inheritance
-#pragma warning(disable : 4250)
-// disable dll export template issue warning
-#pragma warning(disable : 4251)
-#endif
-
-#ifdef CRU_PLATFORM_WINDOWS
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#if defined(CRU_PLATFORM_OSX) || defined(CRU_PLATFORM_LINUX)
-#define CRU_PLATFORM_UNIX
-#endif
diff --git a/include/cru/base/platform/osx/Convert.h b/include/cru/base/platform/osx/Convert.h
index 395cbbae..6250190e 100644
--- a/include/cru/base/platform/osx/Convert.h
+++ b/include/cru/base/platform/osx/Convert.h
@@ -1,5 +1,4 @@
#pragma once
-#include "../../PreConfig.h"
#ifndef CRU_PLATFORM_OSX
#error "This file can only be included on osx."
diff --git a/include/cru/base/platform/osx/Exception.h b/include/cru/base/platform/osx/Exception.h
index 5ab14ebd..c1037cc6 100644
--- a/include/cru/base/platform/osx/Exception.h
+++ b/include/cru/base/platform/osx/Exception.h
@@ -1,5 +1,4 @@
#pragma once
-#include "../../PreConfig.h"
#ifndef CRU_PLATFORM_OSX
#error "This file can only be included on osx."
diff --git a/include/cru/base/platform/unix/PosixSpawnSubProcess.h b/include/cru/base/platform/unix/PosixSpawnSubProcess.h
index ee4e912a..b6f6f880 100644
--- a/include/cru/base/platform/unix/PosixSpawnSubProcess.h
+++ b/include/cru/base/platform/unix/PosixSpawnSubProcess.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
-
#ifndef CRU_PLATFORM_UNIX
#error "This file can only be included on unix."
#endif
diff --git a/include/cru/base/platform/unix/UnixFileStream.h b/include/cru/base/platform/unix/UnixFileStream.h
index 8021f21a..05251db5 100644
--- a/include/cru/base/platform/unix/UnixFileStream.h
+++ b/include/cru/base/platform/unix/UnixFileStream.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
-
#ifndef CRU_PLATFORM_UNIX
#error "This file can only be included on unix."
#endif
diff --git a/include/cru/base/platform/unix/UnixPipe.h b/include/cru/base/platform/unix/UnixPipe.h
index cf35fb11..63bcdadb 100644
--- a/include/cru/base/platform/unix/UnixPipe.h
+++ b/include/cru/base/platform/unix/UnixPipe.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
-
#ifndef CRU_PLATFORM_UNIX
#error "This file can only be included on unix."
#endif
diff --git a/include/cru/base/platform/web/WebException.h b/include/cru/base/platform/web/WebException.h
index d98b8943..85454f82 100644
--- a/include/cru/base/platform/web/WebException.h
+++ b/include/cru/base/platform/web/WebException.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
-
#ifdef CRU_PLATFORM_EMSCRIPTEN
#include "../Exception.h"
diff --git a/include/cru/base/platform/win/ComAutoInit.h b/include/cru/base/platform/win/ComAutoInit.h
index 569085c8..cef819a5 100644
--- a/include/cru/base/platform/win/ComAutoInit.h
+++ b/include/cru/base/platform/win/ComAutoInit.h
@@ -1,6 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
#ifdef CRU_PLATFORM_WINDOWS
#include "WinPreConfig.h"
diff --git a/include/cru/base/platform/win/DebugLogTarget.h b/include/cru/base/platform/win/DebugLogTarget.h
index 8257f637..5f000d94 100644
--- a/include/cru/base/platform/win/DebugLogTarget.h
+++ b/include/cru/base/platform/win/DebugLogTarget.h
@@ -1,6 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
#ifdef CRU_PLATFORM_WINDOWS
#include "WinPreConfig.h"
diff --git a/include/cru/base/platform/win/Exception.h b/include/cru/base/platform/win/Exception.h
index 3e63b191..04bdd32c 100644
--- a/include/cru/base/platform/win/Exception.h
+++ b/include/cru/base/platform/win/Exception.h
@@ -1,6 +1,7 @@
#pragma once
-#include "../../PreConfig.h"
-#ifdef CRU_PLATFORM_WINDOWS
+#ifndef CRU_PLATFORM_WINDOWS
+#error "This file can only be used on Windows."
+#endif
#include "WinPreConfig.h"
diff --git a/include/cru/base/platform/win/StreamConvert.h b/include/cru/base/platform/win/StreamConvert.h
index 3499604a..17552c31 100644
--- a/include/cru/base/platform/win/StreamConvert.h
+++ b/include/cru/base/platform/win/StreamConvert.h
@@ -1,5 +1,4 @@
#pragma once
-#include "../../PreConfig.h"
#ifdef CRU_PLATFORM_WINDOWS
diff --git a/include/cru/base/platform/win/Win32FileStream.h b/include/cru/base/platform/win/Win32FileStream.h
index 06656466..961076de 100644
--- a/include/cru/base/platform/win/Win32FileStream.h
+++ b/include/cru/base/platform/win/Win32FileStream.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../../PreConfig.h"
-
#ifdef CRU_PLATFORM_WINDOWS
#include "../../String.h"
diff --git a/include/cru/base/platform/win/WinPreConfig.h b/include/cru/base/platform/win/WinPreConfig.h
index c2284df3..03e0c03c 100644
--- a/include/cru/base/platform/win/WinPreConfig.h
+++ b/include/cru/base/platform/win/WinPreConfig.h
@@ -1,5 +1,4 @@
#pragma once
-#include "../../PreConfig.h"
#ifdef CRU_PLATFORM_WINDOWS
#define NOMINMAX
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 19feddba..c610abfd 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -67,14 +67,27 @@ if (WIN32)
target_link_libraries(CruBase PUBLIC Shlwapi.lib)
endif()
+if (MSVC)
+ target_compile_options(CruBase PUBLIC /wd4250 /wd4251)
+endif()
+
if (WIN32)
- target_compile_definitions(CruBase PUBLIC CRU_PLATFORM_WINDOWS)
+ target_compile_definitions(CruBase PUBLIC
+ CRU_PLATFORM_WINDOWS
+ _CRT_SECURE_NO_WARNINGS
+ )
elseif(APPLE)
- target_compile_definitions(CruBase PUBLIC CRU_PLATFORM_OSX)
+ target_compile_definitions(CruBase PUBLIC
+ CRU_PLATFORM_OSX
+ CRU_PLATFORM_UNIX
+ )
elseif(EMSCRIPTEN)
target_compile_definitions(CruBase PUBLIC CRU_PLATFORM_EMSCRIPTEN)
else()
- target_compile_definitions(CruBase PUBLIC CRU_PLATFORM_LINUX)
+ target_compile_definitions(CruBase PUBLIC
+ CRU_PLATFORM_LINUX
+ CRU_PLATFORM_UNIX
+ )
endif()
target_link_libraries(CruBase PUBLIC double-conversion)
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 14:33:10 +0000