From 7833a2e83a42e41a9292b98e789ee6799b62c9e1 Mon Sep 17 00:00:00 2001
From: life4gal <life4gal@gmail.com>
Date: Fri, 23 Dec 2022 16:13:26 +0800
Subject: [PATCH] Fixed the use of line separator, which now distinguish
 between platforms, not compilers.

---
 ini/CMakeLists.txt      | 11 +++++------
 ini/include/ini/ini.hpp | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ini/CMakeLists.txt b/ini/CMakeLists.txt
index 33e278c..362c7d2 100644
--- a/ini/CMakeLists.txt
+++ b/ini/CMakeLists.txt
@@ -37,15 +37,14 @@ target_compile_definitions(
 		${PROJECT_NAME_PREFIX}COMPILER_NAME="${${PROJECT_NAME_PREFIX}COMPILER_NAME}"
 		${PROJECT_NAME_PREFIX}COMPILER_VERSION="${${PROJECT_NAME_PREFIX}COMPILER_VERSION}"
 
-		$<$<CXX_COMPILER_ID:MSVC>:${PROJECT_NAME_PREFIX}COMPILER_MSVC>
-		$<$<CXX_COMPILER_ID:GNU>:${PROJECT_NAME_PREFIX}COMPILER_GNU>
+		$<$<CXX_COMPILER_ID:MSVC>:${PROJECT_NAME_PREFIX}COMPILER_MSVC ${PROJECT_NAME_PREFIX}PLATFORM_WINDOWS>
+		$<$<CXX_COMPILER_ID:GNU>:${PROJECT_NAME_PREFIX}COMPILER_GNU ${PROJECT_NAME_PREFIX}PLATFORM_LINUX>
 		# clang-cl
-		# Also defines MSVC
-		$<$<AND:$<CXX_COMPILER_ID:Clang>,$<STREQUAL:"${CMAKE_CXX_SIMULATE_ID}" ,"MSVC">>:${PROJECT_NAME_PREFIX}COMPILER_CLANG_CL ${PROJECT_NAME_PREFIX}COMPILER_MSVC>
+		$<$<AND:$<CXX_COMPILER_ID:Clang>,$<STREQUAL:"${CMAKE_CXX_SIMULATE_ID}","MSVC">>:${PROJECT_NAME_PREFIX}COMPILER_CLANG_CL ${PROJECT_NAME_PREFIX}PLATFORM_WINDOWS>
 		# clang
-		$<$<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<STREQUAL:"${CMAKE_CXX_SIMULATE_ID}" ,"MSVC">>>:${PROJECT_NAME_PREFIX}COMPILER_CLANG>
+		$<$<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<STREQUAL:"${CMAKE_CXX_SIMULATE_ID}","MSVC">>>:${PROJECT_NAME_PREFIX}COMPILER_CLANG ${PROJECT_NAME_PREFIX}PLATFORM_LINUX>
 		# apple clang
-		$<$<CXX_COMPILER_ID:AppleClang>:${PROJECT_NAME_PREFIX}COMPILER_APPLE_CLANG>
+		$<$<CXX_COMPILER_ID:AppleClang>:${PROJECT_NAME_PREFIX}COMPILER_APPLE_CLANG ${PROJECT_NAME_PREFIX}PLATFORM_MACOS>
 		# TODO: MORE COMPILERS HERE.
 )
 
diff --git a/ini/include/ini/ini.hpp b/ini/include/ini/ini.hpp
index 325d6b7..5a8a3c1 100644
--- a/ini/include/ini/ini.hpp
+++ b/ini/include/ini/ini.hpp
@@ -128,7 +128,7 @@ namespace gal::ini
 	{
 		if constexpr (std::is_same_v<Char, wchar_t>)
 		{
-			#ifdef GAL_INI_COMPILER_MSVC
+			#ifdef GAL_INI_PLATFORM_WINDOWS
 			return L"\n";
 			#else
 			return L"\r\n";
@@ -136,7 +136,7 @@ namespace gal::ini
 		}
 		else if constexpr (std::is_same_v<Char, char8_t>)
 		{
-			#ifdef GAL_INI_COMPILER_MSVC
+			#ifdef GAL_INI_PLATFORM_WINDOWS
 			return u8"\n";
 			#else
 			return u8"\r\n";
@@ -144,7 +144,7 @@ namespace gal::ini
 		}
 		else if constexpr (std::is_same_v<Char, char16_t>)
 		{
-			#ifdef GAL_INI_COMPILER_MSVC
+			#ifdef GAL_INI_PLATFORM_WINDOWS
 			return u"\n";
 			#else
 			return u"\r\n";
@@ -152,7 +152,7 @@ namespace gal::ini
 		}
 		else if constexpr (std::is_same_v<Char, char32_t>)
 		{
-			#ifdef GAL_INI_COMPILER_MSVC
+			#ifdef GAL_INI_PLATFORM_WINDOWS
 			return U"\n";
 			#else
 			return U"\r\n";
@@ -160,7 +160,7 @@ namespace gal::ini
 		}
 		else
 		{
-			#ifdef GAL_INI_COMPILER_MSVC
+			#ifdef GAL_INI_PLATFORM_WINDOWS
 			return "\n";
 			#else
 			return "\r\n";