From 9a8b39d71de1f2f63091fd9030bf63ca1a18aabe Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Thu, 30 Mar 2023 22:47:17 +0200 Subject: [PATCH] Additional compiler option changes Force consistency between all libraries --- r5dev/vproj/clientsdk.vcxproj | 6 +++--- r5dev/vproj/dedicated.vcxproj | 2 +- r5dev/vproj/libcurl.vcxproj | 6 +++--- r5dev/vproj/libdebugutils.vcxproj | 2 +- r5dev/vproj/libdetour.vcxproj | 2 +- r5dev/vproj/libdetourcrowd.vcxproj | 2 +- r5dev/vproj/libdetours.vcxproj | 17 +++++++++-------- r5dev/vproj/libdetourtilecache.vcxproj | 2 +- r5dev/vproj/libimgui.vcxproj | 17 +++++++++-------- r5dev/vproj/liblzham.vcxproj | 17 +++++++++-------- r5dev/vproj/libprotobuf.vcxproj | 17 +++++++++-------- r5dev/vproj/librecast.vcxproj | 2 +- r5dev/vproj/libsdl.vcxproj | 18 +++++++++--------- r5dev/vproj/libspdlog.vcxproj | 17 +++++++++-------- r5dev/vproj/naveditor.vcxproj | 6 +++--- r5dev/vproj/netconsole.vcxproj | 22 ++++++++++++---------- r5dev/vproj/pluginsdk.vcxproj | 1 + r5dev/vproj/sdklauncher.vcxproj | 6 +++--- 18 files changed, 85 insertions(+), 77 deletions(-) diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj index cb8de314..dd22c060 100644 --- a/r5dev/vproj/clientsdk.vcxproj +++ b/r5dev/vproj/clientsdk.vcxproj @@ -650,12 +650,12 @@ false Use core\stdafx.h - Speed + Size false - true - AnySuitable + false + Default Default stdcpp17 true diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj index 05a5a470..4ab45d85 100644 --- a/r5dev/vproj/dedicated.vcxproj +++ b/r5dev/vproj/dedicated.vcxproj @@ -124,7 +124,7 @@ core\stdafx.h stdcpp17 true - Speed + Size Default false $(ProjectDir)..\;$(ProjectDir)..\thirdparty\;$(ProjectDir)..\thirdparty\recast\ diff --git a/r5dev/vproj/libcurl.vcxproj b/r5dev/vproj/libcurl.vcxproj index ddbb872a..e89cd4db 100644 --- a/r5dev/vproj/libcurl.vcxproj +++ b/r5dev/vproj/libcurl.vcxproj @@ -404,7 +404,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /D "USE_WINDOWS_SSPI" /D "USE_SCHANNEL" %(AdditionalOptions) stdcpp17 $(ProjectDir)..\thirdparty\curl\include\;$(ProjectDir)..\thirdparty\curl\;$(ProjectDir)..\;%(AdditionalIncludeDirectories) @@ -422,7 +422,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /D "USE_WINDOWS_SSPI" /D "USE_SCHANNEL" %(AdditionalOptions) stdcpp17 Default @@ -448,7 +448,7 @@ false true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_PROFILE - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /D "USE_WINDOWS_SSPI" /D "USE_SCHANNEL" %(AdditionalOptions) stdcpp17 Default diff --git a/r5dev/vproj/libdebugutils.vcxproj b/r5dev/vproj/libdebugutils.vcxproj index 2a882656..7a8feaf8 100644 --- a/r5dev/vproj/libdebugutils.vcxproj +++ b/r5dev/vproj/libdebugutils.vcxproj @@ -120,7 +120,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\thirdparty\recast\ diff --git a/r5dev/vproj/libdetour.vcxproj b/r5dev/vproj/libdetour.vcxproj index e16cf513..e85273ef 100644 --- a/r5dev/vproj/libdetour.vcxproj +++ b/r5dev/vproj/libdetour.vcxproj @@ -128,7 +128,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\thirdparty\recast\ diff --git a/r5dev/vproj/libdetourcrowd.vcxproj b/r5dev/vproj/libdetourcrowd.vcxproj index 28c3d7eb..81765399 100644 --- a/r5dev/vproj/libdetourcrowd.vcxproj +++ b/r5dev/vproj/libdetourcrowd.vcxproj @@ -126,7 +126,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\thirdparty\recast\ diff --git a/r5dev/vproj/libdetours.vcxproj b/r5dev/vproj/libdetours.vcxproj index a414be6f..a0c14e16 100644 --- a/r5dev/vproj/libdetours.vcxproj +++ b/r5dev/vproj/libdetours.vcxproj @@ -191,7 +191,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 $(ProjectDir)..\ @@ -209,17 +209,18 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 - AnySuitable - Speed - true - true + Default + Neither + false + false $(ProjectDir)..\ true Fast true + false Console @@ -235,7 +236,7 @@ false true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_PROFILE - Default + false /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default @@ -286,7 +287,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\ diff --git a/r5dev/vproj/libdetourtilecache.vcxproj b/r5dev/vproj/libdetourtilecache.vcxproj index 9fa0c3c9..6933569d 100644 --- a/r5dev/vproj/libdetourtilecache.vcxproj +++ b/r5dev/vproj/libdetourtilecache.vcxproj @@ -116,7 +116,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\thirdparty\recast\ diff --git a/r5dev/vproj/libimgui.vcxproj b/r5dev/vproj/libimgui.vcxproj index f5fe1428..4f789bdd 100644 --- a/r5dev/vproj/libimgui.vcxproj +++ b/r5dev/vproj/libimgui.vcxproj @@ -176,7 +176,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "BUILDING_LIBIMGUI" /D "IMGUI_DEFINE_MATH_OPERATORS" %(AdditionalOptions) stdcpp17 $(ProjectDir)..\;$(ProjectDir)..\thirdparty\imgui\ @@ -194,16 +194,17 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "BUILDING_LIBIMGUI" /D "IMGUI_DEFINE_MATH_OPERATORS" %(AdditionalOptions) stdcpp17 - AnySuitable - Speed - true - true + Default + Neither + false + false $(ProjectDir)..\;$(ProjectDir)..\thirdparty\imgui\ Fast true + false Console @@ -219,7 +220,7 @@ false true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_PROFILE - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "BUILDING_LIBIMGUI" /D "IMGUI_DEFINE_MATH_OPERATORS" %(AdditionalOptions) stdcpp17 Default @@ -271,7 +272,7 @@ stdcpp17 false Default - Speed + Neither false $(ProjectDir)..\;$(ProjectDir)..\thirdparty\imgui\ true diff --git a/r5dev/vproj/liblzham.vcxproj b/r5dev/vproj/liblzham.vcxproj index fa5e742b..c002e09d 100644 --- a/r5dev/vproj/liblzham.vcxproj +++ b/r5dev/vproj/liblzham.vcxproj @@ -344,7 +344,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 $(ProjectDir)..\ @@ -362,16 +362,17 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 - AnySuitable - Speed - true - true + Default + Neither + false + false $(ProjectDir)..\ Fast true + false Console @@ -387,7 +388,7 @@ false true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_PROFILE - Default + false /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default @@ -438,7 +439,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\ diff --git a/r5dev/vproj/libprotobuf.vcxproj b/r5dev/vproj/libprotobuf.vcxproj index 4ce07dd1..2de17eed 100644 --- a/r5dev/vproj/libprotobuf.vcxproj +++ b/r5dev/vproj/libprotobuf.vcxproj @@ -151,7 +151,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false %(AdditionalOptions) /utf-8 /bigobj /D "_CRT_SECURE_NO_WARNINGS" stdcpp17 $(ProjectDir)..\ @@ -169,17 +169,18 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false %(AdditionalOptions) /utf-8 /bigobj /D "_CRT_SECURE_NO_WARNINGS" stdcpp17 - AnySuitable - Speed - true - true + Default + Neither + false + false $(ProjectDir)..\ true Fast true + false Console @@ -195,7 +196,7 @@ false true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_PROFILE - Default + false %(AdditionalOptions) /utf-8 /bigobj /D "_CRT_SECURE_NO_WARNINGS" stdcpp17 Default @@ -246,7 +247,7 @@ %(AdditionalOptions) /utf-8 /bigobj /D "_CRT_SECURE_NO_WARNINGS" stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\ diff --git a/r5dev/vproj/librecast.vcxproj b/r5dev/vproj/librecast.vcxproj index b90f7749..7564851d 100644 --- a/r5dev/vproj/librecast.vcxproj +++ b/r5dev/vproj/librecast.vcxproj @@ -126,7 +126,7 @@ /D "_CRT_SECURE_NO_WARNINGS" %(AdditionalOptions) stdcpp17 Default - Speed + Neither false false $(ProjectDir)..\thirdparty\recast\ diff --git a/r5dev/vproj/libsdl.vcxproj b/r5dev/vproj/libsdl.vcxproj index 4a467af5..e1919305 100644 --- a/r5dev/vproj/libsdl.vcxproj +++ b/r5dev/vproj/libsdl.vcxproj @@ -163,7 +163,7 @@ OnlyExplicitInline stdcpp17 Fast - Default + false true @@ -229,15 +229,15 @@ Level3 ProgramDatabase true - AnySuitable + Default true - Speed - true - true - true + Neither + false + false + false stdcpp17 Fast - Default + false true @@ -283,7 +283,7 @@ Full true Fast - Default + false true @@ -319,7 +319,7 @@ true Default true - Speed + Neither false false false diff --git a/r5dev/vproj/libspdlog.vcxproj b/r5dev/vproj/libspdlog.vcxproj index 3d54c699..3a8cd26d 100644 --- a/r5dev/vproj/libspdlog.vcxproj +++ b/r5dev/vproj/libspdlog.vcxproj @@ -264,7 +264,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "SPDLOG_COMPILED_LIB" /D "SPDLOG_NO_EXCEPTIONS" %(AdditionalOptions) stdcpp17 $(ProjectDir)\..\thirdparty\;%(AdditionalIncludeDirectories) @@ -282,16 +282,17 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "SPDLOG_COMPILED_LIB" /D "SPDLOG_NO_EXCEPTIONS" %(AdditionalOptions) stdcpp17 - AnySuitable - Speed - true - true + Default + Neither + false + false $(ProjectDir)\..\thirdparty\;%(AdditionalIncludeDirectories) Fast true + false Console @@ -307,7 +308,7 @@ false true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_PROFILE - Default + false /D "_CRT_SECURE_NO_WARNINGS" /D "SPDLOG_COMPILED_LIB" /D "SPDLOG_NO_EXCEPTIONS" %(AdditionalOptions) stdcpp17 Default @@ -359,7 +360,7 @@ stdcpp17 false Default - Speed + Neither false $(ProjectDir)\..\thirdparty\;%(AdditionalIncludeDirectories) true diff --git a/r5dev/vproj/naveditor.vcxproj b/r5dev/vproj/naveditor.vcxproj index 90282695..e7ef77e1 100644 --- a/r5dev/vproj/naveditor.vcxproj +++ b/r5dev/vproj/naveditor.vcxproj @@ -176,10 +176,10 @@ stdcpp17 Use Pch.h - AnySuitable - Speed + Default + Size false - true + false $(ProjectDir)..\;$(ProjectDir)..\thirdparty\recast\ true Precise diff --git a/r5dev/vproj/netconsole.vcxproj b/r5dev/vproj/netconsole.vcxproj index bfd58a93..fdf4a37e 100644 --- a/r5dev/vproj/netconsole.vcxproj +++ b/r5dev/vproj/netconsole.vcxproj @@ -201,7 +201,7 @@ Level3 true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false stdcpp17 /D "_CRT_SECURE_NO_WARNINGS" /D "NETCONSOLE" /D "SPDLOG_COMPILED_LIB" %(AdditionalOptions) Use @@ -230,18 +230,19 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default + false stdcpp17 /D "_CRT_SECURE_NO_WARNINGS" /D "NETCONSOLE" /D "SPDLOG_COMPILED_LIB" /D "SPDLOG_NO_EXCEPTIONS" %(AdditionalOptions) Use core\stdafx.h - AnySuitable - Speed - true - true + Default + Size + false + false $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ Fast true + true Console @@ -267,7 +268,7 @@ false true WIN32;NDEBUG;_PROFILE;_CONSOLE;%(PreprocessorDefinitions) - Default + false stdcpp17 /D "_CRT_SECURE_NO_WARNINGS" /D "NETCONSOLE" /D "SPDLOG_COMPILED_LIB" %(AdditionalOptions) Use @@ -343,15 +344,16 @@ /D "_CRT_SECURE_NO_WARNINGS" /D "NETCONSOLE" /D "SPDLOG_COMPILED_LIB" /D "SPDLOG_NO_EXCEPTIONS" %(AdditionalOptions) Use core\stdafx.h - AnySuitable - Speed + Default + Size false - true + false $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ true Precise false true + true Console diff --git a/r5dev/vproj/pluginsdk.vcxproj b/r5dev/vproj/pluginsdk.vcxproj index 2581ad30..63cbc7c6 100644 --- a/r5dev/vproj/pluginsdk.vcxproj +++ b/r5dev/vproj/pluginsdk.vcxproj @@ -123,6 +123,7 @@ false false true + Size Console diff --git a/r5dev/vproj/sdklauncher.vcxproj b/r5dev/vproj/sdklauncher.vcxproj index 3dacc29b..dc5706cf 100644 --- a/r5dev/vproj/sdklauncher.vcxproj +++ b/r5dev/vproj/sdklauncher.vcxproj @@ -121,13 +121,13 @@ false - Speed + Size false - true + false true - AnySuitable + Default Use stdcpp17 core\stdafx.h