diff --git a/src/common/N3Utils.h b/src/common/N3Utils.h new file mode 100644 index 00000000..f71d94b2 --- /dev/null +++ b/src/common/N3Utils.h @@ -0,0 +1,15 @@ + +#pragma once + +#include +#include +#include + +namespace N3 { + +static bool iequals(const std::string_view & lhs, const std::string_view & rhs) { + auto to_lower{std::ranges::views::transform(::tolower)}; + return std::ranges::equal(lhs | to_lower, rhs | to_lower); +} + +} // namespace N3 diff --git a/src/game/KnightOnLine.vcxproj b/src/game/KnightOnLine.vcxproj index f5bf610e..dbaa6256 100644 --- a/src/game/KnightOnLine.vcxproj +++ b/src/game/KnightOnLine.vcxproj @@ -134,6 +134,7 @@ + diff --git a/src/game/KnightOnLine.vcxproj.filters b/src/game/KnightOnLine.vcxproj.filters index cf28f05b..95b7906a 100644 --- a/src/game/KnightOnLine.vcxproj.filters +++ b/src/game/KnightOnLine.vcxproj.filters @@ -643,6 +643,9 @@ Procedure - Main\UI + + N3Base\Core + diff --git a/src/game/StdAfx.h b/src/game/StdAfx.h index 902953f7..47ce0466 100644 --- a/src/game/StdAfx.h +++ b/src/game/StdAfx.h @@ -22,6 +22,7 @@ #include #include +#include "N3Utils.h" #include "N3Base/My_3DStruct.h" #include "N3Base/N3Log.h" @@ -33,10 +34,3 @@ namespace fs = std::filesystem; #else #define TRACE(fmt, ...) (void)fmt #endif - -namespace N3 { -static bool iequals(const std::string_view & lhs, const std::string_view & rhs) { - auto to_lower{std::ranges::views::transform(::tolower)}; - return std::ranges::equal(lhs | to_lower, rhs | to_lower); -} -} // namespace N3 diff --git a/src/server/AIServer/AIServer.vcxproj b/src/server/AIServer/AIServer.vcxproj index 0409a182..d8a7d39e 100644 --- a/src/server/AIServer/AIServer.vcxproj +++ b/src/server/AIServer/AIServer.vcxproj @@ -166,6 +166,7 @@ + diff --git a/src/server/AIServer/AIServer.vcxproj.filters b/src/server/AIServer/AIServer.vcxproj.filters index 299f9adf..ea217279 100644 --- a/src/server/AIServer/AIServer.vcxproj.filters +++ b/src/server/AIServer/AIServer.vcxproj.filters @@ -286,6 +286,9 @@ Header Files + + Header Files + diff --git a/src/server/AIServer/StdAfx.h b/src/server/AIServer/StdAfx.h index 5ba0de15..ab9881f6 100644 --- a/src/server/AIServer/StdAfx.h +++ b/src/server/AIServer/StdAfx.h @@ -29,6 +29,8 @@ #include #include +#include "N3Utils.h" + //#include "Mmsystem.h" //#include "Imm.h" //#include "N3Base/My_3DStruct.h" @@ -40,10 +42,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -namespace N3 { -static bool iequals(const std::string_view & lhs, const std::string_view & rhs) { - auto to_lower{std::ranges::views::transform(::tolower)}; - return std::ranges::equal(lhs | to_lower, rhs | to_lower); -} -} // namespace N3 diff --git a/src/server/Aujard/Aujard.vcxproj b/src/server/Aujard/Aujard.vcxproj index b463ed3e..0e2e58fd 100644 --- a/src/server/Aujard/Aujard.vcxproj +++ b/src/server/Aujard/Aujard.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h WIN32;_DEBUG;_WINDOWS;__SAMMA;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -91,7 +91,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;__SAMMA;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -129,6 +129,7 @@ + diff --git a/src/server/Aujard/Aujard.vcxproj.filters b/src/server/Aujard/Aujard.vcxproj.filters index fd5c00c5..b46d6628 100644 --- a/src/server/Aujard/Aujard.vcxproj.filters +++ b/src/server/Aujard/Aujard.vcxproj.filters @@ -67,6 +67,9 @@ Header Files + + Header Files + diff --git a/src/server/Ebenezer/Ebenezer.vcxproj b/src/server/Ebenezer/Ebenezer.vcxproj index 91229c0b..d1b7b328 100644 --- a/src/server/Ebenezer/Ebenezer.vcxproj +++ b/src/server/Ebenezer/Ebenezer.vcxproj @@ -169,6 +169,7 @@ + diff --git a/src/server/Ebenezer/Ebenezer.vcxproj.filters b/src/server/Ebenezer/Ebenezer.vcxproj.filters index a243acb6..886011b5 100644 --- a/src/server/Ebenezer/Ebenezer.vcxproj.filters +++ b/src/server/Ebenezer/Ebenezer.vcxproj.filters @@ -305,6 +305,9 @@ Header Files + + Header Files + diff --git a/src/server/ItemManager/ItemManager.vcxproj b/src/server/ItemManager/ItemManager.vcxproj index b455ac72..1fe8dc62 100644 --- a/src/server/ItemManager/ItemManager.vcxproj +++ b/src/server/ItemManager/ItemManager.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h WIN32;_DEBUG;_WINDOWS;_3DSERVER;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -91,7 +91,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_3DSERVER;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -128,6 +128,7 @@ + diff --git a/src/server/ItemManager/ItemManager.vcxproj.filters b/src/server/ItemManager/ItemManager.vcxproj.filters index a6d7b820..b38cac84 100644 --- a/src/server/ItemManager/ItemManager.vcxproj.filters +++ b/src/server/ItemManager/ItemManager.vcxproj.filters @@ -61,6 +61,9 @@ Header Files + + Header Files + diff --git a/src/server/LoginServer/LoginServer.vcxproj b/src/server/LoginServer/LoginServer.vcxproj index 107eb278..6f7fff3d 100644 --- a/src/server/LoginServer/LoginServer.vcxproj +++ b/src/server/LoginServer/LoginServer.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h WIN32;_DEBUG;_WINDOWS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) + $(SrcDir)\common;$(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) + $(SrcDir)\common;$(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -139,6 +139,7 @@ + diff --git a/src/server/LoginServer/LoginServer.vcxproj.filters b/src/server/LoginServer/LoginServer.vcxproj.filters index 42677f32..37766e11 100644 --- a/src/server/LoginServer/LoginServer.vcxproj.filters +++ b/src/server/LoginServer/LoginServer.vcxproj.filters @@ -103,6 +103,9 @@ Header Files + + Header Files + diff --git a/src/tool/KscViewer/KscViewer.vcxproj b/src/tool/KscViewer/KscViewer.vcxproj index d6fb2ca0..eb618397 100644 --- a/src/tool/KscViewer/KscViewer.vcxproj +++ b/src/tool/KscViewer/KscViewer.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(VendorDir)\jpeglib\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(VendorDir)\jpeglib\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\jpeglib\include;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\jpeglib\include;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -135,6 +135,7 @@ + diff --git a/src/tool/KscViewer/KscViewer.vcxproj.filters b/src/tool/KscViewer/KscViewer.vcxproj.filters index c414c32c..e02b0ec0 100644 --- a/src/tool/KscViewer/KscViewer.vcxproj.filters +++ b/src/tool/KscViewer/KscViewer.vcxproj.filters @@ -76,6 +76,9 @@ N3Base + + N3Base + diff --git a/src/tool/Launcher/Launcher/Launcher.vcxproj b/src/tool/Launcher/Launcher/Launcher.vcxproj index ce93d3ac..09fad99c 100644 --- a/src/tool/Launcher/Launcher/Launcher.vcxproj +++ b/src/tool/Launcher/Launcher/Launcher.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h WIN32;_DEBUG;_WINDOWS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) + $(SrcDir)\common;$(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -92,7 +92,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) + $(SrcDir)\common;$(VendorDir)\zlib\include;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -132,6 +132,7 @@ + diff --git a/src/tool/Launcher/Launcher/Launcher.vcxproj.filters b/src/tool/Launcher/Launcher/Launcher.vcxproj.filters index d14b633c..20ae98b2 100644 --- a/src/tool/Launcher/Launcher/Launcher.vcxproj.filters +++ b/src/tool/Launcher/Launcher/Launcher.vcxproj.filters @@ -73,6 +73,9 @@ Header Files + + Header Files + diff --git a/src/tool/N3CE/N3CE.vcxproj b/src/tool/N3CE/N3CE.vcxproj index 2b7b4056..240789ff 100644 --- a/src/tool/N3CE/N3CE.vcxproj +++ b/src/tool/N3CE/N3CE.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -182,6 +182,7 @@ + diff --git a/src/tool/N3CE/N3CE.vcxproj.filters b/src/tool/N3CE/N3CE.vcxproj.filters index b58fb00c..41f4d1ae 100644 --- a/src/tool/N3CE/N3CE.vcxproj.filters +++ b/src/tool/N3CE/N3CE.vcxproj.filters @@ -376,6 +376,9 @@ N3Base + + N3Base + diff --git a/src/tool/N3FXE/N3FXE.vcxproj b/src/tool/N3FXE/N3FXE.vcxproj index ce7c8277..4837c544 100644 --- a/src/tool/N3FXE/N3FXE.vcxproj +++ b/src/tool/N3FXE/N3FXE.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;DIRECTINPUT_VERSION=0x0800;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;DIRECTINPUT_VERSION=0x0800;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -202,6 +202,7 @@ + diff --git a/src/tool/N3FXE/N3FXE.vcxproj.filters b/src/tool/N3FXE/N3FXE.vcxproj.filters index 47fc9a68..a4926441 100644 --- a/src/tool/N3FXE/N3FXE.vcxproj.filters +++ b/src/tool/N3FXE/N3FXE.vcxproj.filters @@ -505,6 +505,9 @@ N3Base + + Header Files + diff --git a/src/tool/N3Indoor/N3Indoor.vcxproj b/src/tool/N3Indoor/N3Indoor.vcxproj index c602836c..a97be665 100644 --- a/src/tool/N3Indoor/N3Indoor.vcxproj +++ b/src/tool/N3Indoor/N3Indoor.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_N3INDOOR;_CRT_SECURE_NO_WARNINGS;DIRECTINPUT_VERSION=0x0800;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_N3INDOOR;_CRT_SECURE_NO_WARNINGS;DIRECTINPUT_VERSION=0x0800;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -145,6 +145,7 @@ + diff --git a/src/tool/N3Indoor/N3Indoor.vcxproj.filters b/src/tool/N3Indoor/N3Indoor.vcxproj.filters index ba3603b8..6cf72ea3 100644 --- a/src/tool/N3Indoor/N3Indoor.vcxproj.filters +++ b/src/tool/N3Indoor/N3Indoor.vcxproj.filters @@ -316,6 +316,9 @@ N3Base + + N3Base + diff --git a/src/tool/N3Indoor/StdAfx.h b/src/tool/N3Indoor/StdAfx.h index e47b6e0e..f7f86794 100644 --- a/src/tool/N3Indoor/StdAfx.h +++ b/src/tool/N3Indoor/StdAfx.h @@ -28,14 +28,9 @@ namespace fs = std::filesystem; -#include "N3Base/My_3DStruct.h" +#include "N3Utils.h" -namespace N3 { -static bool iequals(const std::string_view & lhs, const std::string_view & rhs) { - auto to_lower{std::ranges::views::transform(::tolower)}; - return std::ranges::equal(lhs | to_lower, rhs | to_lower); -} -} // namespace N3 +#include "N3Base/My_3DStruct.h" //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/tool/N3ME/N3ME.vcxproj b/src/tool/N3ME/N3ME.vcxproj index 2c678c17..8a570a0f 100644 --- a/src/tool/N3ME/N3ME.vcxproj +++ b/src/tool/N3ME/N3ME.vcxproj @@ -61,7 +61,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_KNIGHT;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -94,7 +94,7 @@ Use StdAfx.h NDEBUG;WIN32;_WINDOWS;_N3TOOL;_KNIGHT;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(SrcDir)\game;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -253,6 +253,7 @@ + diff --git a/src/tool/N3ME/N3ME.vcxproj.filters b/src/tool/N3ME/N3ME.vcxproj.filters index 2af2e044..a94b52f7 100644 --- a/src/tool/N3ME/N3ME.vcxproj.filters +++ b/src/tool/N3ME/N3ME.vcxproj.filters @@ -726,6 +726,9 @@ N3Base + + N3Base + diff --git a/src/tool/N3TexViewer/N3TexViewer.vcxproj b/src/tool/N3TexViewer/N3TexViewer.vcxproj index fce22b26..e1a4b0ba 100644 --- a/src/tool/N3TexViewer/N3TexViewer.vcxproj +++ b/src/tool/N3TexViewer/N3TexViewer.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -143,6 +143,7 @@ + diff --git a/src/tool/N3TexViewer/N3TexViewer.vcxproj.filters b/src/tool/N3TexViewer/N3TexViewer.vcxproj.filters index 8f1939ef..b30b3d2b 100644 --- a/src/tool/N3TexViewer/N3TexViewer.vcxproj.filters +++ b/src/tool/N3TexViewer/N3TexViewer.vcxproj.filters @@ -127,6 +127,9 @@ N3Base + + N3Base + diff --git a/src/tool/N3TexViewer/StdAfx.h b/src/tool/N3TexViewer/StdAfx.h index e47b6e0e..f969e3b6 100644 --- a/src/tool/N3TexViewer/StdAfx.h +++ b/src/tool/N3TexViewer/StdAfx.h @@ -30,12 +30,5 @@ namespace fs = std::filesystem; #include "N3Base/My_3DStruct.h" -namespace N3 { -static bool iequals(const std::string_view & lhs, const std::string_view & rhs) { - auto to_lower{std::ranges::views::transform(::tolower)}; - return std::ranges::equal(lhs | to_lower, rhs | to_lower); -} -} // namespace N3 - //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/tool/N3Viewer/N3Viewer.vcxproj b/src/tool/N3Viewer/N3Viewer.vcxproj index 4e2994a6..c97392e6 100644 --- a/src/tool/N3Viewer/N3Viewer.vcxproj +++ b/src/tool/N3Viewer/N3Viewer.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -178,6 +178,7 @@ + diff --git a/src/tool/N3Viewer/N3Viewer.vcxproj.filters b/src/tool/N3Viewer/N3Viewer.vcxproj.filters index e709342e..d9f2831e 100644 --- a/src/tool/N3Viewer/N3Viewer.vcxproj.filters +++ b/src/tool/N3Viewer/N3Viewer.vcxproj.filters @@ -340,6 +340,9 @@ Header Files + + Header Files + diff --git a/src/tool/Option/Option.vcxproj b/src/tool/Option/Option.vcxproj index d6c43d3f..1a473900 100644 --- a/src/tool/Option/Option.vcxproj +++ b/src/tool/Option/Option.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -91,7 +91,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -126,6 +126,7 @@ + diff --git a/src/tool/Option/Option.vcxproj.filters b/src/tool/Option/Option.vcxproj.filters index d6a82a47..84453acf 100644 --- a/src/tool/Option/Option.vcxproj.filters +++ b/src/tool/Option/Option.vcxproj.filters @@ -43,6 +43,9 @@ Header Files + + Header Files + diff --git a/src/tool/RscTables/RscTables.vcxproj b/src/tool/RscTables/RscTables.vcxproj index 7843949b..26740cde 100644 --- a/src/tool/RscTables/RscTables.vcxproj +++ b/src/tool/RscTables/RscTables.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -91,7 +91,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(WindowsSDK_IncludePath) + $(SrcDir)\common;$(WindowsSDK_IncludePath) /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -129,6 +129,7 @@ + diff --git a/src/tool/RscTables/RscTables.vcxproj.filters b/src/tool/RscTables/RscTables.vcxproj.filters index 91f06cc2..a07066cf 100644 --- a/src/tool/RscTables/RscTables.vcxproj.filters +++ b/src/tool/RscTables/RscTables.vcxproj.filters @@ -61,6 +61,9 @@ Header Files + + Header Files + diff --git a/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj b/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj index 68b618f1..c0f74545 100644 --- a/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj +++ b/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -143,6 +143,7 @@ + diff --git a/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj.filters b/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj.filters index dd71512e..152023d1 100644 --- a/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj.filters +++ b/src/tool/ServerInfoViewer/ServerInfoViewer.vcxproj.filters @@ -133,6 +133,9 @@ N3Base + + N3Base + diff --git a/src/tool/SkyViewer/SkyViewer.vcxproj b/src/tool/SkyViewer/SkyViewer.vcxproj index a7e00221..621a3428 100644 --- a/src/tool/SkyViewer/SkyViewer.vcxproj +++ b/src/tool/SkyViewer/SkyViewer.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -163,6 +163,7 @@ + diff --git a/src/tool/SkyViewer/SkyViewer.vcxproj.filters b/src/tool/SkyViewer/SkyViewer.vcxproj.filters index 3fc8dc60..9bdca345 100644 --- a/src/tool/SkyViewer/SkyViewer.vcxproj.filters +++ b/src/tool/SkyViewer/SkyViewer.vcxproj.filters @@ -250,6 +250,9 @@ N3Base + + N3Base + diff --git a/src/tool/UIE/UIE.vcxproj b/src/tool/UIE/UIE.vcxproj index 27568ea7..3a853b4c 100644 --- a/src/tool/UIE/UIE.vcxproj +++ b/src/tool/UIE/UIE.vcxproj @@ -59,7 +59,7 @@ Use StdAfx.h _DEBUG;WIN32;_WINDOWS;_N3TOOL;_N3UIE;DIRECTINPUT_VERSION=0x0800;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) EnableFastChecks EditAndContinue @@ -93,7 +93,7 @@ Use StdAfx.h WIN32;NDEBUG;_WINDOWS;_N3TOOL;_N3UIE;DIRECTINPUT_VERSION=0x0800;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - $(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include + $(SrcDir)\common;$(SrcDir)\engine;$(VendorDir)\spdlog\include;$(WindowsSDK_IncludePath);$(VendorDir)\DXSDK9\Include /wd4018 /wd4091 /wd4244 /wd4267 /wd4477 /wd4838 /wd6031 /wd26495 /wd4102 %(AdditionalOptions) true true @@ -169,6 +169,7 @@ + diff --git a/src/tool/UIE/UIE.vcxproj.filters b/src/tool/UIE/UIE.vcxproj.filters index a498ebc0..b62d817b 100644 --- a/src/tool/UIE/UIE.vcxproj.filters +++ b/src/tool/UIE/UIE.vcxproj.filters @@ -301,6 +301,9 @@ Dialogs + + N3Base +