diff --git a/src/compat/Debug.props b/src/compat/Debug.props
new file mode 100644
index 00000000..e5e9f681
--- /dev/null
+++ b/src/compat/Debug.props
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ <_PropertySheetDisplayName>compat-Debug
+ true
+
+
+
+ EnableFastChecks
+ Disabled
+ _DEBUG;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ EditAndContinue
+ true
+
+
+
+
\ No newline at end of file
diff --git a/src/compat/PropertySheet.props b/src/compat/PropertySheet.props
index 1e5c2f96..4cad994b 100644
--- a/src/compat/PropertySheet.props
+++ b/src/compat/PropertySheet.props
@@ -9,8 +9,23 @@
$(OPENVPN_DEPROOT)
$(OPENVPN_DEPROOT)
-
-
+
+ $(SolutionDir)$(Platform)-Output\$(Configuration)\
+ <_PropertySheetDisplayName>compat
+
+
+
+ Level3
+ WIN32;$(CPPFLAGS);%(PreprocessorDefinitions)
+ $(SOURCEBASE);$(SOURCEBASE)/include;%(AdditionalIncludeDirectories)
+
+
+ true
+
+
+ $(SOURCEBASE);%(AdditionalIncludeDirectories)
+
+
$(SOURCEBASE)
diff --git a/src/compat/Release.props b/src/compat/Release.props
new file mode 100644
index 00000000..63828b79
--- /dev/null
+++ b/src/compat/Release.props
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+ <_PropertySheetDisplayName>compat-Release
+ false
+
+
+
+ true
+ true
+ MultiThreadedDLL
+ ProgramDatabase
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ true
+ true
+
+
+
+
\ No newline at end of file
diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj
index d6473581..111dacdd 100644
--- a/src/compat/compat.vcxproj
+++ b/src/compat/compat.vcxproj
@@ -52,83 +52,46 @@
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.30319.1
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(Configuration)\
- Disabled
- $(SOURCEBASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- EditAndContinue
+ $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _LIB;%(PreprocessorDefinitions)
- Disabled
- $(SOURCEBASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- ProgramDatabase
+ $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _LIB;%(PreprocessorDefinitions)
- MaxSpeed
- true
- $(SOURCEBASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
+ $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _LIB;%(PreprocessorDefinitions)
- MaxSpeed
- true
- $(SOURCEBASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
+ $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _LIB;%(PreprocessorDefinitions)
diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj
index 8fb7bee8..92d7e32e 100644
--- a/src/openvpn/openvpn.vcxproj
+++ b/src/openvpn/openvpn.vcxproj
@@ -52,133 +52,74 @@
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.30319.1
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(Configuration)\
- true
- true
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(Configuration)\
- false
- false
- Disabled
- $(SOURCEBASE);$(SOURCEBASE)/src/compat;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- EditAndContinue
- UNICODE
+ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
+ UNICODE;%(UndefinePreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies)
$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)
- true
Console
- MachineX86
- Disabled
- $(SOURCEBASE);$(SOURCEBASE)/src/compat;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- ProgramDatabase
- UNICODE
+ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
+ UNICODE;%(UndefinePreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies)
$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)
- true
Console
- MaxSpeed
- true
- $(SOURCEBASE);$(SOURCEBASE)/src/compat;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
- UNICODE
+ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
+ UNICODE;%(UndefinePreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies)
$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)
- true
Console
- true
- true
- MachineX86
- MaxSpeed
- true
- $(SOURCEBASE);$(SOURCEBASE)/src/compat;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
- UNICODE
+ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
+ UNICODE;%(UndefinePreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies)
$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)
- true
Console
- true
- true
diff --git a/src/openvpn/openvpn.vcxproj.filters b/src/openvpn/openvpn.vcxproj.filters
index 4152236d..7a9aa631 100644
--- a/src/openvpn/openvpn.vcxproj.filters
+++ b/src/openvpn/openvpn.vcxproj.filters
@@ -228,6 +228,12 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
@@ -476,6 +482,12 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+
diff --git a/src/openvpnserv/openvpnserv.vcxproj b/src/openvpnserv/openvpnserv.vcxproj
index 4edcf851..74077570 100644
--- a/src/openvpnserv/openvpnserv.vcxproj
+++ b/src/openvpnserv/openvpnserv.vcxproj
@@ -52,124 +52,66 @@
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.30319.1
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(Configuration)\
- true
- true
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(SolutionDir)$(Platform)-Output\$(Configuration)\
- $(Configuration)\
- false
- false
- Disabled
- $(SOURCEBASE);..\..\include;..\openvpn;..\compat;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- EditAndContinue
+ ..\openvpn;..\compat;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)
- true
Console
- MachineX86
- Disabled
- $(SOURCEBASE);..\..\include;..\openvpn;..\compat;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- ProgramDatabase
+ ..\openvpn;..\compat;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)
- true
Console
- MaxSpeed
- true
- $(SOURCEBASE);..\..\include;..\openvpn;..\compat;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
+ ..\openvpn;..\compat;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)
- true
Console
- true
- true
- MachineX86
- MaxSpeed
- true
- $(SOURCEBASE);..\..\include;..\openvpn;..\compat;%(AdditionalIncludeDirectories)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
+ ..\openvpn;..\compat;%(AdditionalIncludeDirectories)
+ _CONSOLE;%(PreprocessorDefinitions)
-
- $(SOURCEBASE);%(AdditionalIncludeDirectories)
-
+
legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)
- true
Console
- true
- true
diff --git a/src/openvpnserv/openvpnserv.vcxproj.filters b/src/openvpnserv/openvpnserv.vcxproj.filters
index 0c89b4f4..3ce9bb24 100644
--- a/src/openvpnserv/openvpnserv.vcxproj.filters
+++ b/src/openvpnserv/openvpnserv.vcxproj.filters
@@ -15,10 +15,22 @@
-
+
Source Files
-
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
Source Files
@@ -26,6 +38,12 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+