Fixed the use of line separator, which now distinguish between platfo…

…rms, not compilers.
Life4gal · Dec 23, 2022 · 7833a2e · 7833a2e
1 parent b5c46c7
commit 7833a2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -128,39 +128,39 @@ 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";
 			#endif
 		}
 		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";
 			#endif
 		}
 		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";
 			#endif
 		}
 		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";
 			#endif
 		}
 		else
 		{
-			#ifdef GAL_INI_COMPILER_MSVC
+			#ifdef GAL_INI_PLATFORM_WINDOWS
 			return "\n";
 			#else
 			return "\r\n";