diff --git a/Src/C3.sln b/Src/C3.sln index f5a9be4..eb24474 100644 --- a/Src/C3.sln +++ b/Src/C3.sln @@ -47,6 +47,12 @@ Global Common\Common.vcxitems*{f2ec73d1-d533-4ee4-955a-a62e306472cc}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + ClangDebug|x64 = ClangDebug|x64 + ClangDebug|x86 = ClangDebug|x86 + ClangRelease|x64 = ClangRelease|x64 + ClangRelease|x86 = ClangRelease|x86 + ClangRwdi|x64 = ClangRwdi|x64 + ClangRwdi|x86 = ClangRwdi|x86 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|x64 = Release|x64 @@ -55,6 +61,18 @@ Global ReleaseWithDebInfo|x86 = ReleaseWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangDebug|x64.ActiveCfg = ClangDebug|x64 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangDebug|x64.Build.0 = ClangDebug|x64 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangDebug|x86.ActiveCfg = ClangDebug|Win32 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangDebug|x86.Build.0 = ClangDebug|Win32 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRelease|x64.ActiveCfg = ClangRelease|x64 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRelease|x64.Build.0 = ClangRelease|x64 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRelease|x86.ActiveCfg = ClangRelease|Win32 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRelease|x86.Build.0 = ClangRelease|Win32 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRwdi|x64.ActiveCfg = ClangRwdi|x64 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRwdi|x64.Build.0 = ClangRwdi|x64 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRwdi|x86.ActiveCfg = ClangRwdi|Win32 + {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ClangRwdi|x86.Build.0 = ClangRwdi|Win32 {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.Debug|x64.ActiveCfg = Debug|x64 {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.Debug|x64.Build.0 = Debug|x64 {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.Debug|x86.ActiveCfg = Debug|Win32 @@ -67,6 +85,18 @@ Global {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ReleaseWithDebInfo|x64.Build.0 = ReleaseWithDebInfo|x64 {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ReleaseWithDebInfo|x86.ActiveCfg = ReleaseWithDebInfo|Win32 {D00C849B-4FA5-4E84-B9EF-B1C8C338647A}.ReleaseWithDebInfo|x86.Build.0 = ReleaseWithDebInfo|Win32 + {B7C64002-5002-410F-868C-826073AFA924}.ClangDebug|x64.ActiveCfg = ClangDebug|x64 + {B7C64002-5002-410F-868C-826073AFA924}.ClangDebug|x64.Build.0 = ClangDebug|x64 + {B7C64002-5002-410F-868C-826073AFA924}.ClangDebug|x86.ActiveCfg = ClangDebug|Win32 + {B7C64002-5002-410F-868C-826073AFA924}.ClangDebug|x86.Build.0 = ClangDebug|Win32 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRelease|x64.ActiveCfg = ClangRelease|x64 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRelease|x64.Build.0 = ClangRelease|x64 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRelease|x86.ActiveCfg = ClangRelease|Win32 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRelease|x86.Build.0 = ClangRelease|Win32 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRwdi|x64.ActiveCfg = ClangRwdi|x64 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRwdi|x64.Build.0 = ClangRwdi|x64 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRwdi|x86.ActiveCfg = ClangRwdi|Win32 + {B7C64002-5002-410F-868C-826073AFA924}.ClangRwdi|x86.Build.0 = ClangRwdi|Win32 {B7C64002-5002-410F-868C-826073AFA924}.Debug|x64.ActiveCfg = Debug|x64 {B7C64002-5002-410F-868C-826073AFA924}.Debug|x64.Build.0 = Debug|x64 {B7C64002-5002-410F-868C-826073AFA924}.Debug|x86.ActiveCfg = Debug|Win32 @@ -79,6 +109,18 @@ Global {B7C64002-5002-410F-868C-826073AFA924}.ReleaseWithDebInfo|x64.Build.0 = ReleaseWithDebInfo|x64 {B7C64002-5002-410F-868C-826073AFA924}.ReleaseWithDebInfo|x86.ActiveCfg = ReleaseWithDebInfo|Win32 {B7C64002-5002-410F-868C-826073AFA924}.ReleaseWithDebInfo|x86.Build.0 = ReleaseWithDebInfo|Win32 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangDebug|x64.ActiveCfg = ClangDebug|x64 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangDebug|x64.Build.0 = ClangDebug|x64 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangDebug|x86.ActiveCfg = ClangDebug|Win32 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangDebug|x86.Build.0 = ClangDebug|Win32 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRelease|x64.ActiveCfg = ClangRelease|x64 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRelease|x64.Build.0 = ClangRelease|x64 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRelease|x86.ActiveCfg = ClangRelease|Win32 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRelease|x86.Build.0 = ClangRelease|Win32 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRwdi|x64.ActiveCfg = ClangRwdi|x64 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRwdi|x64.Build.0 = ClangRwdi|x64 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRwdi|x86.ActiveCfg = ClangRwdi|Win32 + {946619C2-5959-4C0C-BC7C-1C27D825B042}.ClangRwdi|x86.Build.0 = ClangRwdi|Win32 {946619C2-5959-4C0C-BC7C-1C27D825B042}.Debug|x64.ActiveCfg = Debug|x64 {946619C2-5959-4C0C-BC7C-1C27D825B042}.Debug|x64.Build.0 = Debug|x64 {946619C2-5959-4C0C-BC7C-1C27D825B042}.Debug|x86.ActiveCfg = Debug|Win32 @@ -91,6 +133,18 @@ Global {946619C2-5959-4C0C-BC7C-1C27D825B042}.ReleaseWithDebInfo|x64.Build.0 = ReleaseWithDebInfo|x64 {946619C2-5959-4C0C-BC7C-1C27D825B042}.ReleaseWithDebInfo|x86.ActiveCfg = ReleaseWithDebInfo|Win32 {946619C2-5959-4C0C-BC7C-1C27D825B042}.ReleaseWithDebInfo|x86.Build.0 = ReleaseWithDebInfo|Win32 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangDebug|x64.ActiveCfg = ClangDebug|x64 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangDebug|x64.Build.0 = ClangDebug|x64 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangDebug|x86.ActiveCfg = ClangDebug|Win32 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangDebug|x86.Build.0 = ClangDebug|Win32 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRelease|x64.ActiveCfg = ClangRelease|x64 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRelease|x64.Build.0 = ClangRelease|x64 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRelease|x86.ActiveCfg = ClangRelease|Win32 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRelease|x86.Build.0 = ClangRelease|Win32 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRwdi|x64.ActiveCfg = ClangRwdi|x64 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRwdi|x64.Build.0 = ClangRwdi|x64 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRwdi|x86.ActiveCfg = ClangRwdi|Win32 + {9341205B-AEE0-483B-9A80-975C2084C3AE}.ClangRwdi|x86.Build.0 = ClangRwdi|Win32 {9341205B-AEE0-483B-9A80-975C2084C3AE}.Debug|x64.ActiveCfg = Debug|x64 {9341205B-AEE0-483B-9A80-975C2084C3AE}.Debug|x64.Build.0 = Debug|x64 {9341205B-AEE0-483B-9A80-975C2084C3AE}.Debug|x86.ActiveCfg = Debug|Win32 @@ -103,6 +157,18 @@ Global {9341205B-AEE0-483B-9A80-975C2084C3AE}.ReleaseWithDebInfo|x64.Build.0 = ReleaseWithDebInfo|x64 {9341205B-AEE0-483B-9A80-975C2084C3AE}.ReleaseWithDebInfo|x86.ActiveCfg = ReleaseWithDebInfo|Win32 {9341205B-AEE0-483B-9A80-975C2084C3AE}.ReleaseWithDebInfo|x86.Build.0 = ReleaseWithDebInfo|Win32 + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangDebug|x64.ActiveCfg = Debug|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangDebug|x64.Build.0 = Debug|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangDebug|x86.ActiveCfg = Debug|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangDebug|x86.Build.0 = Debug|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRelease|x64.ActiveCfg = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRelease|x64.Build.0 = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRelease|x86.ActiveCfg = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRelease|x86.Build.0 = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRwdi|x64.ActiveCfg = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRwdi|x64.Build.0 = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRwdi|x86.ActiveCfg = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ClangRwdi|x86.Build.0 = Release|Any CPU {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.Debug|x64.ActiveCfg = Debug|Any CPU {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.Debug|x64.Build.0 = Debug|Any CPU {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -111,10 +177,22 @@ Global {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.Release|x64.Build.0 = Release|Any CPU {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.Release|x86.ActiveCfg = Release|Any CPU {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.Release|x86.Build.0 = Release|Any CPU - {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x64.ActiveCfg = ReleaseWithDebInfo|Any CPU - {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x64.Build.0 = ReleaseWithDebInfo|Any CPU - {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x86.ActiveCfg = ReleaseWithDebInfo|Any CPU - {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x86.Build.0 = ReleaseWithDebInfo|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x64.ActiveCfg = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x64.Build.0 = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x86.ActiveCfg = Release|Any CPU + {023B2DB0-6DA4-4F0D-988B-4D9BF522DA37}.ReleaseWithDebInfo|x86.Build.0 = Release|Any CPU + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangDebug|x64.ActiveCfg = ClangDebug|x64 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangDebug|x64.Build.0 = ClangDebug|x64 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangDebug|x86.ActiveCfg = ClangDebug|Win32 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangDebug|x86.Build.0 = ClangDebug|Win32 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRelease|x64.ActiveCfg = ClangRelease|x64 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRelease|x64.Build.0 = ClangRelease|x64 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRelease|x86.ActiveCfg = ClangRelease|Win32 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRelease|x86.Build.0 = ClangRelease|Win32 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRwdi|x64.ActiveCfg = ClangRwdi|x64 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRwdi|x64.Build.0 = ClangRwdi|x64 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRwdi|x86.ActiveCfg = ClangRwdi|Win32 + {53182258-F40E-4104-AFC6-1F327E556E77}.ClangRwdi|x86.Build.0 = ClangRwdi|Win32 {53182258-F40E-4104-AFC6-1F327E556E77}.Debug|x64.ActiveCfg = Debug|x64 {53182258-F40E-4104-AFC6-1F327E556E77}.Debug|x64.Build.0 = Debug|x64 {53182258-F40E-4104-AFC6-1F327E556E77}.Debug|x64.Deploy.0 = Debug|x64 @@ -132,6 +210,18 @@ Global {53182258-F40E-4104-AFC6-1F327E556E77}.ReleaseWithDebInfo|x86.ActiveCfg = ReleaseWithDebInfo|Win32 {53182258-F40E-4104-AFC6-1F327E556E77}.ReleaseWithDebInfo|x86.Build.0 = ReleaseWithDebInfo|Win32 {53182258-F40E-4104-AFC6-1F327E556E77}.ReleaseWithDebInfo|x86.Deploy.0 = ReleaseWithDebInfo|Win32 + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangDebug|x64.ActiveCfg = Debug|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangDebug|x64.Build.0 = Debug|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangDebug|x86.ActiveCfg = Debug|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangDebug|x86.Build.0 = Debug|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRelease|x64.ActiveCfg = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRelease|x64.Build.0 = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRelease|x86.ActiveCfg = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRelease|x86.Build.0 = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRwdi|x64.ActiveCfg = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRwdi|x64.Build.0 = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRwdi|x86.ActiveCfg = Release|Any CPU + {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ClangRwdi|x86.Build.0 = Release|Any CPU {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.Debug|x64.ActiveCfg = Debug|Any CPU {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.Debug|x64.Build.0 = Debug|Any CPU {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -144,6 +234,18 @@ Global {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ReleaseWithDebInfo|x64.Build.0 = Release|Any CPU {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ReleaseWithDebInfo|x86.ActiveCfg = Release|Any CPU {BC9BC3C3-4FBC-4F36-866C-AC2B4758BEBE}.ReleaseWithDebInfo|x86.Build.0 = Release|Any CPU + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangDebug|x64.ActiveCfg = ClangDebug|x64 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangDebug|x64.Build.0 = ClangDebug|x64 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangDebug|x86.ActiveCfg = ClangDebug|Win32 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangDebug|x86.Build.0 = ClangDebug|Win32 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRelease|x64.ActiveCfg = ClangRelease|x64 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRelease|x64.Build.0 = ClangRelease|x64 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRelease|x86.ActiveCfg = ClangRelease|Win32 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRelease|x86.Build.0 = ClangRelease|Win32 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRwdi|x64.ActiveCfg = ClangRwdi|x64 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRwdi|x64.Build.0 = ClangRwdi|x64 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRwdi|x86.ActiveCfg = ClangRwdi|Win32 + {F2EC73D1-D533-4EE4-955A-A62E306472CC}.ClangRwdi|x86.Build.0 = ClangRwdi|Win32 {F2EC73D1-D533-4EE4-955A-A62E306472CC}.Debug|x64.ActiveCfg = Debug|x64 {F2EC73D1-D533-4EE4-955A-A62E306472CC}.Debug|x64.Build.0 = Debug|x64 {F2EC73D1-D533-4EE4-955A-A62E306472CC}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/Src/CebuLoader/AccessPayload.h b/Src/CebuLoader/AccessPayload.h index e65795f..f4cb9a5 100644 --- a/Src/CebuLoader/AccessPayload.h +++ b/Src/CebuLoader/AccessPayload.h @@ -1,5 +1,5 @@ #pragma once -#include "gen/EmbeddedResource.h" +#include "EmbeddedResource.h" #ifndef EMBEDDED_DLL_PAYLOAD #error Unknown resource guid. #endif // !EMBEDDED_DLL_PAYLOAD diff --git a/Src/CebuLoader/CebuLoader.rc b/Src/CebuLoader/CebuLoader.rc index bab4945..9c6136d 100644 --- a/Src/CebuLoader/CebuLoader.rc +++ b/Src/CebuLoader/CebuLoader.rc @@ -49,8 +49,7 @@ END // // DATA // - -IDR_DATA_! RCDATA "gen\EmbeddedResource.dat" +IDR_DATA_! RCDATA "EmbeddedResource.dat" #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/CebuLoader/CebuLoader.vcxproj b/Src/CebuLoader/CebuLoader.vcxproj index 77e0f38..e5cc2a3 100644 --- a/Src/CebuLoader/CebuLoader.vcxproj +++ b/Src/CebuLoader/CebuLoader.vcxproj @@ -1,6 +1,30 @@  + + ClangDebug + Win32 + + + ClangDebug + x64 + + + ClangRelease + Win32 + + + ClangRelease + x64 + + + ClangRwdi + Win32 + + + ClangRwdi + x64 + Debug Win32 @@ -40,6 +64,12 @@ v142 Unicode + + Application + true + ClangCL + Unicode + DynamicLibrary false @@ -47,6 +77,13 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + DynamicLibrary false @@ -54,12 +91,25 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + Application true v142 Unicode + + Application + true + ClangCL + Unicode + DynamicLibrary false @@ -67,6 +117,13 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + DynamicLibrary false @@ -74,6 +131,13 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + @@ -81,21 +145,39 @@ + + + + + + + + + + + + + + + + + + true @@ -103,36 +185,72 @@ $(SolutionDir)..\Bin\ $(ProjectName)_d86 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d86 + true $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_d64 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi64 + Use @@ -142,7 +260,7 @@ true - $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common MultiThreadedDebug stdcpp17 false @@ -156,8 +274,42 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) - dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(SolutionDir)..\Bin\NodeRelayDll_d86.dll" "$(ProjectDir)\" "StartNodeRelay" + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_d86.dll" "$(IntDir)\gen" "StartNodeRelay" + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + MultiThreadedDebug + stdcpp17 + false + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_d86.dll" "$(IntDir)\gen" "StartNodeRelay" + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + @@ -168,7 +320,7 @@ true - $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common MultiThreadedDebug stdcpp17 EditAndContinue @@ -183,8 +335,43 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) - dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(SolutionDir)..\Bin\NodeRelayDll_d64.dll" "$(ProjectDir)\" "StartNodeRelay" + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_d64.dll" "$(IntDir)\gen" "StartNodeRelay" + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + + + + + Use + Level3 + Disabled + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + MultiThreadedDebug + stdcpp17 + EditAndContinue + false + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_d64.dll" "$(IntDir)\gen" "StartNodeRelay" + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + @@ -195,7 +382,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common MultiThreaded @@ -220,8 +407,53 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) - dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(SolutionDir)..\Bin\NodeRelayDll_r86.dll" "$(ProjectDir)\" "StartNodeRelay" + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_r86.dll" "$(IntDir)\gen" "StartNodeRelay" + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + + + + + Level3 + Use + MinSpace + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + None + Size + stdcpp17 + false + false + Default + true + false + + + Windows + true + true + false + false + %(IgnoreSpecificDefaultLibraries) + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_r86.dll" "$(IntDir)\gen" "StartNodeRelay" + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + @@ -232,7 +464,7 @@ true C3_RWDI;WIN32;NDEBUG;%(PreprocessorDefinitions) true - $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common MultiThreaded @@ -256,8 +488,52 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) - dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(SolutionDir)..\Bin\NodeRelayDll_rwdi86.dll" "$(ProjectDir)\" "StartNodeRelay" + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_rwdi86.dll" "$(IntDir)\gen" "StartNodeRelay" + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + + + + + Level3 + Use + MinSpace + true + true + C3_RWDI;WIN32;NDEBUG;%(PreprocessorDefinitions) + true + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + false + Default + false + + + Windows + true + true + true + false + %(IgnoreSpecificDefaultLibraries) + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_rwdi86.dll" "$(IntDir)\gen" "StartNodeRelay" + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + @@ -268,7 +544,7 @@ true NDEBUG;%(PreprocessorDefinitions) true - $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common MultiThreaded @@ -291,8 +567,51 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) - dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(SolutionDir)..\Bin\NodeRelayDll_r64.dll" "$(ProjectDir)\" "StartNodeRelay" + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_r64.dll" "$(IntDir)\gen" "StartNodeRelay" + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + + + + + Level3 + Use + MinSpace + true + true + NDEBUG;%(PreprocessorDefinitions) + true + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + None + Size + stdcpp17 + false + false + Default + true + false + + + Windows + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_r64.dll" "$(IntDir)\gen" "StartNodeRelay" + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + @@ -303,7 +622,7 @@ true C3_RWDI;NDEBUG;%(PreprocessorDefinitions) true - $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common MultiThreaded @@ -325,8 +644,50 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) - dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(SolutionDir)..\Bin\NodeRelayDll_rwdi64.dll" "$(ProjectDir)\" "StartNodeRelay" + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_rwdi64.dll" "$(IntDir)\gen" "StartNodeRelay" + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + + + + + Level3 + Use + MinSpace + true + true + C3_RWDI;NDEBUG;%(PreprocessorDefinitions) + true + $(IntDir)/gen;$(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + false + Default + false + + + Windows + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + dotnet "$(SolutionDir)..\Bin\Tools\netcoreapp2.1\ResourceGenerator.dll" "$(OutDir)NodeRelayDll_rwdi64.dll" "$(IntDir)\gen" "StartNodeRelay" + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + $(IntDir)gen + @@ -334,17 +695,29 @@ Create + Create StdAfx.h + StdAfx.h Create + Create Create + Create StdAfx.h + StdAfx.h StdAfx.h + StdAfx.h Create + Create StdAfx.h + StdAfx.h Create + Create Create + Create StdAfx.h + StdAfx.h StdAfx.h + StdAfx.h diff --git a/Src/ChannelLinter/ChannelLinter.vcxproj b/Src/ChannelLinter/ChannelLinter.vcxproj index fb828ea..e2514e3 100644 --- a/Src/ChannelLinter/ChannelLinter.vcxproj +++ b/Src/ChannelLinter/ChannelLinter.vcxproj @@ -1,6 +1,30 @@  + + ClangDebug + Win32 + + + ClangDebug + x64 + + + ClangRelease + Win32 + + + ClangRelease + x64 + + + ClangRwdi + Win32 + + + ClangRwdi + x64 + Debug Win32 @@ -40,6 +64,12 @@ v142 Unicode + + Application + true + ClangCL + Unicode + Application false @@ -47,6 +77,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application false @@ -54,12 +91,25 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application true v142 Unicode + + Application + true + ClangCL + Unicode + Application false @@ -67,6 +117,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application false @@ -74,6 +131,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + @@ -83,21 +147,39 @@ + + + + + + + + + + + + + + + + + + true @@ -105,42 +187,100 @@ $(SolutionDir)..\Bin\ $(ProjectName)_d86 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d86 + true $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_d64 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi64 + Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreadedDebug + stdcpp17 + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -162,7 +302,29 @@ Use Level3 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreadedDebug + stdcpp17 + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -186,7 +348,36 @@ MinSpace true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -215,7 +406,36 @@ MinSpace true true - C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -244,7 +464,36 @@ MinSpace true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -273,7 +522,36 @@ MinSpace true true - C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -314,11 +592,17 @@ Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/Src/Common/CppRestSdk/include/cpprest/http_client.h b/Src/Common/CppRestSdk/include/cpprest/http_client.h index 58ab16a..aa8a3be 100644 --- a/Src/Common/CppRestSdk/include/cpprest/http_client.h +++ b/Src/Common/CppRestSdk/include/cpprest/http_client.h @@ -30,7 +30,7 @@ #define CPPRESTSDK_BUILD_TYPE "release/" #endif -#pragma comment(lib, "Common/CppRestSdk/lib/" CPPRESTSDK_BUILD_TYPE CPPRESTSDK_ARCH "cpprest142_2_10.lib") +#pragma comment(lib, C3_SOLUTION_DIR "Common/CppRestSdk/lib/" CPPRESTSDK_BUILD_TYPE CPPRESTSDK_ARCH "cpprest142_2_10.lib") #undef CPPRESTSDK_ARCH #undef CPPRESTSDK_BUILD_TYPE diff --git a/Src/Common/FSecure/C3/Sdk.hpp b/Src/Common/FSecure/C3/Sdk.hpp index ff404d1..8169bb4 100644 --- a/Src/Common/FSecure/C3/Sdk.hpp +++ b/Src/Common/FSecure/C3/Sdk.hpp @@ -7,18 +7,18 @@ // C3 Core static library. #ifdef _WIN64 # ifdef _DEBUG -# pragma comment(lib, "../Bin/Core_d64.lib") +# pragma comment(lib, C3_BIN_DIR "Core_d64.lib") # elif defined(C3_RWDI) -# pragma comment(lib, "../Bin/Core_rwdi64.lib") +# pragma comment(lib, C3_BIN_DIR "Core_rwdi64.lib") # else -# pragma comment(lib, "../Bin/Core_r64.lib") +# pragma comment(lib, C3_BIN_DIR "Core_r64.lib") # endif #else # ifdef _DEBUG -# pragma comment(lib, "../Bin/Core_d86.lib") +# pragma comment(lib, C3_BIN_DIR "Core_d86.lib") # elif defined(C3_RWDI) -# pragma comment(lib, "../Bin/Core_rwdi86.lib") +# pragma comment(lib, C3_BIN_DIR "Core_rwdi86.lib") # else -# pragma comment(lib, "../Bin/Core_r86.lib") +# pragma comment(lib, C3_BIN_DIR "Core_r86.lib") # endif #endif diff --git a/Src/Common/FSecure/CppTools/Compression.cpp b/Src/Common/FSecure/CppTools/Compression.cpp index 8194bed..a8fa3c8 100644 --- a/Src/Common/FSecure/CppTools/Compression.cpp +++ b/Src/Common/FSecure/CppTools/Compression.cpp @@ -14,7 +14,7 @@ #define Z_DEBUG "" #endif -#pragma comment(lib, "Common/zlib/lib/" Z_PLATFORM "zlib" Z_DEBUG ".lib") +#pragma comment(lib, C3_SOLUTION_DIR "Common/zlib/lib/" Z_PLATFORM "zlib" Z_DEBUG ".lib") namespace FSecure::Compression { diff --git a/Src/Common/FSecure/Crypto/PrecompiledHeader.hpp b/Src/Common/FSecure/Crypto/PrecompiledHeader.hpp index 57aa309..876b81b 100644 --- a/Src/Common/FSecure/Crypto/PrecompiledHeader.hpp +++ b/Src/Common/FSecure/Crypto/PrecompiledHeader.hpp @@ -21,14 +21,14 @@ // Static libraries. #ifdef _WIN64 # ifdef _DEBUG -# pragma comment(lib, "Common/libSodium/libsodium-x64-v141-debug.lib") +# pragma comment(lib, C3_SOLUTION_DIR "Common/libSodium/libsodium-x64-v141-debug.lib") # else -# pragma comment(lib, "Common/libSodium/libsodium-x64-v141-release.lib") +# pragma comment(lib, C3_SOLUTION_DIR "Common/libSodium/libsodium-x64-v141-release.lib") # endif #else # ifdef _DEBUG -# pragma comment(lib, "Common/libSodium/libsodium-x86-v141-debug.lib") +# pragma comment(lib, C3_SOLUTION_DIR "Common/libSodium/libsodium-x86-v141-debug.lib") # else -# pragma comment(lib, "Common/libSodium/libsodium-x86-v141-release.lib") +# pragma comment(lib, C3_SOLUTION_DIR "Common/libSodium/libsodium-x86-v141-release.lib") # endif #endif diff --git a/Src/Core/Core.vcxproj b/Src/Core/Core.vcxproj index 1f1093b..d262142 100644 --- a/Src/Core/Core.vcxproj +++ b/Src/Core/Core.vcxproj @@ -1,6 +1,30 @@  + + ClangDebug + Win32 + + + ClangDebug + x64 + + + ClangRelease + Win32 + + + ClangRelease + x64 + + + ClangRwdi + Win32 + + + ClangRwdi + x64 + Debug Win32 @@ -40,6 +64,12 @@ v142 Unicode + + StaticLibrary + true + ClangCL + Unicode + StaticLibrary false @@ -47,6 +77,13 @@ true Unicode + + StaticLibrary + false + ClangCL + true + Unicode + StaticLibrary false @@ -54,12 +91,25 @@ true Unicode + + StaticLibrary + false + ClangCL + true + Unicode + StaticLibrary true v142 Unicode + + StaticLibrary + true + ClangCL + Unicode + StaticLibrary false @@ -67,6 +117,13 @@ true Unicode + + StaticLibrary + false + ClangCL + true + Unicode + StaticLibrary false @@ -74,6 +131,13 @@ true Unicode + + StaticLibrary + false + ClangCL + true + Unicode + @@ -82,21 +146,39 @@ + + + + + + + + + + + + + + + + + + true @@ -104,42 +186,99 @@ $(SolutionDir)..\Bin\ $(ProjectName)_d86 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d86 + true $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName)_d64 $(SolutionDir)..\Bin\ + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)_d64 + $(SolutionDir)..\Bin\Clang\ + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName)_r86 $(SolutionDir)..\Bin\ + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)_r86 + $(SolutionDir)..\Bin\Clang\ + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName)_rwdi86 $(SolutionDir)..\Bin\ + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)_rwdi86 + $(SolutionDir)..\Bin\Clang\ + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName)_r64 $(SolutionDir)..\Bin\ + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)_r64 + $(SolutionDir)..\Bin\Clang\ + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName)_rwdi64 $(SolutionDir)..\Bin\ + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)_rwdi64 + $(SolutionDir)..\Bin\Clang\ + Use Level3 Disabled - WIN32;_DEBUG;_NO_ASYNCRTIMP;_CONSOLE;%(PreprocessorDefinitions) + C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_NO_ASYNCRTIMP;_CONSOLE;%(PreprocessorDefinitions) + true + + + . + MultiThreadedDebug + stdcpp17 + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + + + + + Use + Level3 + Disabled + C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_NO_ASYNCRTIMP;_CONSOLE;%(PreprocessorDefinitions) true @@ -160,7 +299,28 @@ Use Level3 Disabled - ;_DEBUG;_CONSOLE;_NO_ASYNCRTIMP;%(PreprocessorDefinitions) + C3_SOLUTION_DIR=R"($(SolutionDir))";;_DEBUG;_CONSOLE;_NO_ASYNCRTIMP;%(PreprocessorDefinitions) + true + + + . + MultiThreadedDebug + stdcpp17 + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + + + + + Use + Level3 + Disabled + C3_SOLUTION_DIR=R"($(SolutionDir))";;_DEBUG;_CONSOLE;_NO_ASYNCRTIMP;%(PreprocessorDefinitions) true @@ -183,7 +343,7 @@ MinSpace true true - ;_NO_ASYNCRTIMP;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_SOLUTION_DIR=R"($(SolutionDir))";;_NO_ASYNCRTIMP;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -203,6 +363,36 @@ true + + + Level3 + Use + MinSpace + true + true + C3_SOLUTION_DIR=R"($(SolutionDir))";;_NO_ASYNCRTIMP;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + None + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + true + + + Console + true + true + true + + + false + + Level3 @@ -210,7 +400,7 @@ MinSpace true true - C3_RWDI;_NO_ASYNCRTIMP;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;_NO_ASYNCRTIMP;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -229,6 +419,35 @@ true + + + Level3 + Use + MinSpace + true + true + C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;_NO_ASYNCRTIMP;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + true + + + false + + Level3 @@ -236,7 +455,7 @@ MinSpace true true - ;_NO_ASYNCRTIMP;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_SOLUTION_DIR=R"($(SolutionDir))";;_NO_ASYNCRTIMP;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -256,6 +475,36 @@ true + + + Level3 + Use + MinSpace + true + true + C3_SOLUTION_DIR=R"($(SolutionDir))";;_NO_ASYNCRTIMP;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + None + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + true + + + Console + true + true + true + + + false + + Level3 @@ -263,7 +512,7 @@ MinSpace true true - C3_RWDI;_NO_ASYNCRTIMP;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;_NO_ASYNCRTIMP;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -282,6 +531,35 @@ true + + + Level3 + Use + MinSpace + true + true + C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;_NO_ASYNCRTIMP;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + true + + + false + + @@ -314,11 +592,17 @@ Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/Src/Gateway/Gateway.vcxproj b/Src/Gateway/Gateway.vcxproj index 39b0155..bb6ad1d 100644 --- a/Src/Gateway/Gateway.vcxproj +++ b/Src/Gateway/Gateway.vcxproj @@ -1,6 +1,30 @@  + + ClangDebug + Win32 + + + ClangDebug + x64 + + + ClangRelease + Win32 + + + ClangRelease + x64 + + + ClangRwdi + Win32 + + + ClangRwdi + x64 + Debug Win32 @@ -40,6 +64,12 @@ v142 Unicode + + Application + true + ClangCL + Unicode + Application false @@ -47,6 +77,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application false @@ -54,12 +91,25 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application true v142 Unicode + + Application + true + ClangCL + Unicode + Application false @@ -67,6 +117,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application false @@ -74,6 +131,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + @@ -83,21 +147,39 @@ + + + + + + + + + + + + + + + + + + true @@ -105,42 +187,100 @@ $(SolutionDir)..\Bin\ $(ProjectName)_d86 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d86 + true $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_d64 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi64 + Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreadedDebug + stdcpp17 + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -162,7 +302,29 @@ Use Level3 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreadedDebug + stdcpp17 + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -186,7 +348,36 @@ MinSpace true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -215,7 +406,36 @@ MinSpace true true - C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -244,7 +464,36 @@ MinSpace true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions); + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions); true @@ -273,7 +522,36 @@ MinSpace true true - C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + false + + + Console + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -302,11 +580,17 @@ Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/Src/NodeRelayConsoleExe/NodeRelayConsoleExe.vcxproj b/Src/NodeRelayConsoleExe/NodeRelayConsoleExe.vcxproj index 6be4a6a..f5b2969 100644 --- a/Src/NodeRelayConsoleExe/NodeRelayConsoleExe.vcxproj +++ b/Src/NodeRelayConsoleExe/NodeRelayConsoleExe.vcxproj @@ -1,6 +1,30 @@  + + ClangDebug + Win32 + + + ClangDebug + x64 + + + ClangRelease + Win32 + + + ClangRelease + x64 + + + ClangRwdi + Win32 + + + ClangRwdi + x64 + Debug Win32 @@ -40,6 +64,12 @@ v142 Unicode + + Application + true + ClangCL + Unicode + Application false @@ -47,6 +77,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application false @@ -54,12 +91,25 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application true v142 Unicode + + Application + true + ClangCL + Unicode + Application false @@ -67,6 +117,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + Application false @@ -74,6 +131,13 @@ true Unicode + + Application + false + ClangCL + true + Unicode + @@ -83,21 +147,39 @@ + + + + + + + + + + + + + + + + + + true @@ -105,42 +187,100 @@ $(SolutionDir)..\Bin\ $(ProjectName)_d86 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d86 + true $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_d64 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi64 + Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + MultiThreadedDebug + stdcpp17 + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -162,7 +302,30 @@ Use Level3 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + MultiThreadedDebug + stdcpp17 + EditAndContinue + false + + + Console + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -187,7 +350,41 @@ MinSpace true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + None + Size + stdcpp17 + false + false + Default + true + + + Windows + true + true + false + false + %(IgnoreSpecificDefaultLibraries) + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + mainCRTStartup + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -221,7 +418,39 @@ MinSpace true true - C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + false + Default + + + Console + true + true + true + false + %(IgnoreSpecificDefaultLibraries) + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -253,7 +482,38 @@ MinSpace true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + None + Size + stdcpp17 + false + false + Default + + + Windows + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + mainCRTStartup + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -284,7 +544,37 @@ MinSpace true true - C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + ProgramDatabase + Size + stdcpp17 + false + false + Default + + + Console + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";C3_RWDI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -311,17 +601,29 @@ Create + Create StdAfx.h + StdAfx.h Create + Create Create + Create StdAfx.h + StdAfx.h StdAfx.h + StdAfx.h Create + Create StdAfx.h + StdAfx.h Create + Create Create + Create StdAfx.h + StdAfx.h StdAfx.h + StdAfx.h diff --git a/Src/NodeRelayDll/NodeRelayDll.vcxproj b/Src/NodeRelayDll/NodeRelayDll.vcxproj index 104c452..922c655 100644 --- a/Src/NodeRelayDll/NodeRelayDll.vcxproj +++ b/Src/NodeRelayDll/NodeRelayDll.vcxproj @@ -1,6 +1,30 @@  + + ClangDebug + Win32 + + + ClangDebug + x64 + + + ClangRelease + Win32 + + + ClangRelease + x64 + + + ClangRwdi + Win32 + + + ClangRwdi + x64 + Debug Win32 @@ -40,6 +64,12 @@ v142 Unicode + + DynamicLibrary + true + ClangCL + Unicode + DynamicLibrary false @@ -47,6 +77,13 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + DynamicLibrary false @@ -54,12 +91,25 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + DynamicLibrary true v142 Unicode + + DynamicLibrary + true + ClangCL + Unicode + DynamicLibrary false @@ -67,6 +117,13 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + DynamicLibrary false @@ -74,6 +131,13 @@ true Unicode + + DynamicLibrary + false + ClangCL + true + Unicode + @@ -83,21 +147,39 @@ + + + + + + + + + + + + + + + + + + true @@ -105,42 +187,100 @@ $(SolutionDir)..\Bin\ $(ProjectName)_d86 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d86 + true $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_d64 + + true + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_d64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi86 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi86 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_r64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_r64 + false $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)..\Bin\ $(ProjectName)_rwdi64 + + false + $(SolutionDir)..\Tmp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)..\Bin\Clang\ + $(ProjectName)_rwdi64 + Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + MultiThreadedDebug + stdcpp17 + false + + + Windows + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -162,7 +302,29 @@ Use Level3 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + MultiThreadedDebug + stdcpp17 + false + + + Windows + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -186,7 +348,37 @@ MinSpace true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + stdcpp17 + false + false + Default + Size + None + + + Windows + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -216,7 +408,36 @@ MinSpace true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);C3_RWDI + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);C3_RWDI + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + MultiThreaded + stdcpp17 + false + false + Default + Size + + + Windows + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);C3_RWDI true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -245,7 +466,37 @@ MinSpace true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + stdcpp17 + MultiThreaded + false + false + Default + Size + None + + + Windows + true + true + false + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -275,7 +526,36 @@ MinSpace true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions);C3_RWDI + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);C3_RWDI + true + $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common + + + stdcpp17 + MultiThreaded + false + false + Default + Size + + + Windows + true + true + true + $(SolutionDir);$(ProjectDir) + /ignore:4099 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MinSpace + true + true + C3_BIN_DIR=R"($(OutDir))";C3_SOLUTION_DIR=R"($(SolutionDir))";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);C3_RWDI true $(SolutionDir);$(ProjectDir);$(SolutionDir)/Common @@ -301,17 +581,29 @@ Create + Create StdAfx.h + StdAfx.h Create + Create Create + Create StdAfx.h + StdAfx.h StdAfx.h + StdAfx.h Create + Create StdAfx.h + StdAfx.h Create + Create Create + Create StdAfx.h + StdAfx.h StdAfx.h + StdAfx.h diff --git a/Src/Tools/ResourceGenerator/Program.cs b/Src/Tools/ResourceGenerator/Program.cs index 70031bb..acbcb42 100644 --- a/Src/Tools/ResourceGenerator/Program.cs +++ b/Src/Tools/ResourceGenerator/Program.cs @@ -9,13 +9,13 @@ namespace ResourceGenerator { static int Main(string[] args) { - if (args.Length < 2 || !File.Exists(args[0]) || !Directory.Exists(args[1])) + if (args.Length < 2 || !File.Exists(args[0])) { System.Console.WriteLine("ResourceGenerator require existing input file and output directory."); return 1; } - var outputDir = Path.Join(args[1], "gen"); + var outputDir = args[1]; if (!Directory.Exists(outputDir)) Directory.CreateDirectory(outputDir); diff --git a/Src/Tools/ResourceGenerator/ResourceGenerator.csproj b/Src/Tools/ResourceGenerator/ResourceGenerator.csproj index 95b3645..860d906 100644 --- a/Src/Tools/ResourceGenerator/ResourceGenerator.csproj +++ b/Src/Tools/ResourceGenerator/ResourceGenerator.csproj @@ -5,6 +5,7 @@ netcoreapp2.1 ResourceGenerator.Program + Debug;Release diff --git a/Src/WebController/Backend/WebController.csproj b/Src/WebController/Backend/WebController.csproj index f84080f..f1ddb9c 100644 --- a/Src/WebController/Backend/WebController.csproj +++ b/Src/WebController/Backend/WebController.csproj @@ -6,7 +6,7 @@ AspNetCoreModuleV2 FSecure.C3.WebController C3WebController - Debug;Release;ReleaseWithDebInfo + Debug;Release @@ -21,12 +21,6 @@ TRACE;s - - ..\..\..\Bin\WebController\Release - ..\..\..\Tmp\WebController\Release - TRACE;s - -