diff --git a/makefiles/win32/Norm.sln b/makefiles/win32/Norm.sln
index 67a88c9..12e2cd9 100644
--- a/makefiles/win32/Norm.sln
+++ b/makefiles/win32/Norm.sln
@@ -26,49 +26,55 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D7B0023C-8798-4918-8DA0-05C9054D70B9}.Debug|Win32.ActiveCfg = Debug|Win32
{D7B0023C-8798-4918-8DA0-05C9054D70B9}.Debug|Win32.Build.0 = Debug|Win32
- {D7B0023C-8798-4918-8DA0-05C9054D70B9}.Debug|x64.ActiveCfg = Debug|Win32
+ {D7B0023C-8798-4918-8DA0-05C9054D70B9}.Debug|x64.ActiveCfg = Debug|x64
{D7B0023C-8798-4918-8DA0-05C9054D70B9}.Release|Win32.ActiveCfg = Release|Win32
{D7B0023C-8798-4918-8DA0-05C9054D70B9}.Release|Win32.Build.0 = Release|Win32
- {D7B0023C-8798-4918-8DA0-05C9054D70B9}.Release|x64.ActiveCfg = Release|Win32
+ {D7B0023C-8798-4918-8DA0-05C9054D70B9}.Release|x64.ActiveCfg = Release|x64
+ {D7B0023C-8798-4918-8DA0-05C9054D70B9}.Release|x64.Build.0 = Release|x64
{6E1308A6-D40F-489E-A4F1-40D859380D64}.Debug|Win32.ActiveCfg = Debug|Win32
{6E1308A6-D40F-489E-A4F1-40D859380D64}.Debug|Win32.Build.0 = Debug|Win32
{6E1308A6-D40F-489E-A4F1-40D859380D64}.Debug|x64.ActiveCfg = Debug|x64
{6E1308A6-D40F-489E-A4F1-40D859380D64}.Debug|x64.Build.0 = Debug|x64
{6E1308A6-D40F-489E-A4F1-40D859380D64}.Release|Win32.ActiveCfg = Release|Win32
{6E1308A6-D40F-489E-A4F1-40D859380D64}.Release|Win32.Build.0 = Release|Win32
- {6E1308A6-D40F-489E-A4F1-40D859380D64}.Release|x64.ActiveCfg = Release|Win32
- {6E1308A6-D40F-489E-A4F1-40D859380D64}.Release|x64.Build.0 = Release|Win32
+ {6E1308A6-D40F-489E-A4F1-40D859380D64}.Release|x64.ActiveCfg = Release|x64
+ {6E1308A6-D40F-489E-A4F1-40D859380D64}.Release|x64.Build.0 = Release|x64
{32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Debug|Win32.ActiveCfg = Debug|Win32
{32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Debug|Win32.Build.0 = Debug|Win32
- {32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Debug|x64.ActiveCfg = Debug|Win32
+ {32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Debug|x64.ActiveCfg = Debug|x64
{32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Release|Win32.ActiveCfg = Release|Win32
{32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Release|Win32.Build.0 = Release|Win32
- {32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Release|x64.ActiveCfg = Release|Win32
+ {32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Release|x64.ActiveCfg = Release|x64
+ {32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}.Release|x64.Build.0 = Release|x64
{182006F3-188F-466E-89FE-8421C0478691}.Debug|Win32.ActiveCfg = Debug|Win32
{182006F3-188F-466E-89FE-8421C0478691}.Debug|Win32.Build.0 = Debug|Win32
- {182006F3-188F-466E-89FE-8421C0478691}.Debug|x64.ActiveCfg = Debug|Win32
+ {182006F3-188F-466E-89FE-8421C0478691}.Debug|x64.ActiveCfg = Debug|x64
+ {182006F3-188F-466E-89FE-8421C0478691}.Debug|x64.Build.0 = Debug|x64
{182006F3-188F-466E-89FE-8421C0478691}.Release|Win32.ActiveCfg = Release|Win32
{182006F3-188F-466E-89FE-8421C0478691}.Release|Win32.Build.0 = Release|Win32
- {182006F3-188F-466E-89FE-8421C0478691}.Release|x64.ActiveCfg = Release|Win32
+ {182006F3-188F-466E-89FE-8421C0478691}.Release|x64.ActiveCfg = Release|x64
+ {182006F3-188F-466E-89FE-8421C0478691}.Release|x64.Build.0 = Release|x64
{7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Debug|Win32.ActiveCfg = Debug|Win32
{7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Debug|Win32.Build.0 = Debug|Win32
- {7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Debug|x64.ActiveCfg = Debug|Win32
+ {7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Debug|x64.ActiveCfg = Debug|x64
{7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Release|Win32.ActiveCfg = Release|Win32
- {7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Release|x64.ActiveCfg = Release|Win32
+ {7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Release|x64.ActiveCfg = Release|x64
+ {7BF4525B-9185-4296-A2BF-FFE77BB66EAF}.Release|x64.Build.0 = Release|x64
{DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Debug|Win32.ActiveCfg = Debug|Win32
{DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Debug|Win32.Build.0 = Debug|Win32
{DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Debug|x64.ActiveCfg = Debug|x64
{DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Debug|x64.Build.0 = Debug|x64
{DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Release|Win32.ActiveCfg = Release|Win32
{DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Release|Win32.Build.0 = Release|Win32
- {DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Release|x64.ActiveCfg = Release|Win32
- {DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Release|x64.Build.0 = Release|Win32
+ {DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Release|x64.ActiveCfg = Release|x64
+ {DE94F096-A09B-44B6-8EFE-C7BF1F65C4C9}.Release|x64.Build.0 = Release|x64
{7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Debug|Win32.ActiveCfg = Debug|Win32
{7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Debug|Win32.Build.0 = Debug|Win32
- {7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Debug|x64.ActiveCfg = Debug|Win32
+ {7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Debug|x64.ActiveCfg = Debug|x64
{7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Release|Win32.ActiveCfg = Release|Win32
{7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Release|Win32.Build.0 = Release|Win32
- {7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Release|x64.ActiveCfg = Release|Win32
+ {7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Release|x64.ActiveCfg = Release|x64
+ {7B453DAC-67A1-48AB-B6D4-BA25F698A158}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/makefiles/win32/NormDll.vcxproj b/makefiles/win32/NormDll.vcxproj
index 485a4db..7a06474 100755
--- a/makefiles/win32/NormDll.vcxproj
+++ b/makefiles/win32/NormDll.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{182006F3-188F-466E-89FE-8421C0478691}
@@ -21,11 +29,21 @@
v141
MultiByte
+
+ DynamicLibrary
+ v141
+ MultiByte
+
DynamicLibrary
v141
MultiByte
+
+ DynamicLibrary
+ v141
+ MultiByte
+
@@ -33,10 +51,18 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>11.0.50727.1
@@ -46,11 +72,17 @@
Debug\
true
+
+ true
+
Release\
Release\
false
+
+ false
+
Disabled
@@ -75,6 +107,30 @@
MachineX86
+
+
+ Disabled
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NORM_USE_DLL;PROTO_DEBUG;HAVE_IPV6;HAVE_ASSERT;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ $(OutDir)Norm.dll
+ true
+ $(OutDir)NormDll.pdb
+ Windows
+ false
+
+
+ $(OutDir)Norm.lib
+
+
..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
@@ -97,6 +153,29 @@
MachineX86
+
+
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NORM_USE_DLL;NDEBUG;PROTO_DEBUG;HAVE_IPV6;HAVE_ASSERT;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ $(OutDir)Norm.dll
+ true
+ Windows
+ true
+ true
+ false
+
+
+ $(OutDir)Norm.lib
+
+
diff --git a/makefiles/win32/NormLib.vcxproj b/makefiles/win32/NormLib.vcxproj
index 35e176e..356c55f 100755
--- a/makefiles/win32/NormLib.vcxproj
+++ b/makefiles/win32/NormLib.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{D7B0023C-8798-4918-8DA0-05C9054D70B9}
@@ -22,6 +30,13 @@
MultiByte
false
+
+ StaticLibrary
+ v141
+ false
+ MultiByte
+ false
+
StaticLibrary
v141
@@ -29,6 +44,13 @@
MultiByte
false
+
+ StaticLibrary
+ v141
+ false
+ MultiByte
+ false
+
@@ -36,10 +58,18 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>11.0.50727.1
@@ -48,6 +78,7 @@
.\Debug\
.\Debug\
+
.\Release\
.\Release\
@@ -77,6 +108,32 @@
true
+
+
+ Disabled
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ PROTO_DEBUG;HAVE_IPV6;HAVE_ASSERT;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ .\Debug/NormLib.pch
+ .\Debug/
+ .\Debug/
+ .\Debug/
+ Level3
+ true
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ .\Debug\NormLib.lib
+ true
+
+
MaxSpeed
@@ -104,6 +161,34 @@
true
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NDEBUG;PROTO_DEBUG;HAVE_IPV6;HAVE_ASSERT;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ .\Release/NormLib.pch
+ .\Release/
+ .\Release/
+ .\Release/
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ .\Release\NormLib.lib
+ true
+
+
diff --git a/makefiles/win32/normCast.vcxproj b/makefiles/win32/normCast.vcxproj
index d086116..2f2b633 100644
--- a/makefiles/win32/normCast.vcxproj
+++ b/makefiles/win32/normCast.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{7B453DAC-67A1-48AB-B6D4-BA25F698A158}
@@ -22,12 +30,24 @@
false
MultiByte
+
+ Application
+ v141
+ false
+ MultiByte
+
Application
v141
false
MultiByte
+
+ Application
+ v141
+ false
+ MultiByte
+
@@ -35,10 +55,18 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>11.0.50727.1
@@ -48,12 +76,19 @@
.\Debug\
+
+
+
.\Release\
.\Release\
false
false
+
+ false
+ false
+
.\Debug/normTest.tlb
@@ -93,6 +128,47 @@
MachineX86
+
+
+ .\Debug/normTest.tlb
+
+
+
+
+ Disabled
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NORM_USE_DLL;PROTO_DEBUG;HAVE_ASSERT;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+
+
+ .\Debug/normTest.pch
+ .\Debug/
+ .\Debug/
+ .\Debug/
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ iphlpapi.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ .\Debug/normCast.exe
+ true
+ ./;%(AdditionalLibraryDirectories)
+ true
+ .\Debug/normTest.pdb
+ Console
+ false
+
+
+
+
.\Release/normTest.tlb
@@ -131,6 +207,46 @@
MachineX86
+
+
+ .\Release/normTest.tlb
+
+
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NORM_USE_DLL;PROTO_DEBUG;WIN32;HAVE_ASSERT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ .\Release/normTest.pch
+ .\Release/
+ .\Release/
+ .\Release/
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ iphlpapi.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ .\Release/normCast.exe
+ true
+ .\Release/normTest.pdb
+ Console
+ false
+
+
+
+
diff --git a/makefiles/win32/normTest.vcxproj b/makefiles/win32/normTest.vcxproj
index dfc2002..5194ee9 100755
--- a/makefiles/win32/normTest.vcxproj
+++ b/makefiles/win32/normTest.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{32CF83E0-D2E0-4E43-8F7B-72BD0AB64647}
@@ -22,12 +30,24 @@
false
MultiByte
+
+ Application
+ v141
+ false
+ MultiByte
+
Application
v141
false
MultiByte
+
+ Application
+ v141
+ false
+ MultiByte
+
@@ -35,10 +55,18 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>11.0.50727.1
@@ -48,12 +76,19 @@
.\Debug\
+
+
+
.\Release\
.\Release\
false
false
+
+ false
+ false
+
.\Debug/normTest.tlb
@@ -93,6 +128,47 @@
MachineX86
+
+
+ .\Debug/normTest.tlb
+
+
+
+
+ Disabled
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NORM_USE_DLL;PROTO_DEBUG;HAVE_ASSERT;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+
+
+ .\Debug/normTest.pch
+ .\Debug/
+ .\Debug/
+ .\Debug/
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ iphlpapi.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ .\Debug/normTest.exe
+ true
+ ./;%(AdditionalLibraryDirectories)
+ true
+ .\Debug/normTest.pdb
+ Console
+ false
+
+
+
+
.\Release/normTest.tlb
@@ -131,6 +207,46 @@
MachineX86
+
+
+ .\Release/normTest.tlb
+
+
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NORM_USE_DLL;PROTO_DEBUG;WIN32;HAVE_ASSERT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ .\Release/normTest.pch
+ .\Release/
+ .\Release/
+ .\Release/
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ iphlpapi.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ .\Release/normTest.exe
+ true
+ .\Release/normTest.pdb
+ Console
+ false
+
+
+
+
diff --git a/makefiles/win32/npc.vcxproj b/makefiles/win32/npc.vcxproj
index 0381218..0c44544 100755
--- a/makefiles/win32/npc.vcxproj
+++ b/makefiles/win32/npc.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{7BF4525B-9185-4296-A2BF-FFE77BB66EAF}
@@ -22,12 +30,24 @@
false
MultiByte
+
+ Application
+ v141
+ false
+ MultiByte
+
Application
v141
false
MultiByte
+
+ Application
+ v141
+ false
+ MultiByte
+
@@ -35,10 +55,18 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>11.0.50727.1
@@ -48,12 +76,19 @@
.\Debug\
+
+
+
.\Release\
.\Release\
false
false
+
+ false
+ false
+
.\Debug/normTest.tlb
@@ -91,6 +126,45 @@
MachineX86
+
+
+ .\Debug/normTest.tlb
+
+
+
+
+ Disabled
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ PROTO_DEBUG;HAVE_IPV6;HAVE_ASSERT;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+
+
+ .\Debug/normTest.pch
+ .\Debug/
+ .\Debug/
+ .\Debug/
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ iphlpapi.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+ ./;%(AdditionalLibraryDirectories)
+ true
+ Windows
+ false
+
+
+
+
.\Release/normTest.tlb
@@ -127,6 +201,44 @@
MachineX86
+
+
+ .\Release/normTest.tlb
+
+
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\include;..\..\protolib\include;%(AdditionalIncludeDirectories)
+ NDEBUG;PROTO_DEBUG;HAVE_IPV6;HAVE_ASSERT;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ .\Release/normTest.pch
+ .\Release/
+ .\Release/
+ .\Release/
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ iphlpapi.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+ Windows
+ false
+
+
+
+
diff --git a/protolib b/protolib
index 0952def..6e08403 160000
--- a/protolib
+++ b/protolib
@@ -1 +1 @@
-Subproject commit 0952def39217dd0e50360221f1d4f2fa8cac488e
+Subproject commit 6e0840332b2fab4adef33ca817d0cc1a2bc7dadd