Message-ID: <4F740B02.7080503@...515...> Date: Thu, 29 Mar 2012 10:10:58 +0300 From: =?UTF-8?B?U2FtdWxpIFNlcHDDpG5lbg==?= MIME-Version: 1.0 References: <4F6D06C5.3030408@...1114...> <1332575918-3384-5-git-send-email-alon.barlev@...277...> In-Reply-To: <1332575918-3384-5-git-send-email-alon.barlev@...277...> Subject: Re: [Openvpn-devel] [PATCH 4/6] build: msvc: upgrade to Visual Studio 2010 + fixups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable To: Alon Bar-Lev Cc: "Openvpn-devel@lists.sourceforge.net" Hi, This looks ok, provided we don't need Visual Studio for official releases anymore (signing the installer, openvpn.exe and tap-driver). The version I had to use for 2.3-alpha1 and earlier was VS2008. I doubt James minds either, as he's still using his old Python build system. When he's ready to move on, the upgrade license costs around $500[1] - provided that he even wants/needs to build with Visual Studio at that point. ACK. Samuli [1] > Signed-off-by: Alon Bar-Lev > --- > .gitignore | 2 + > build/msvc/msvc-generate/Makefile.am | 2 +- > build/msvc/msvc-generate/msvc-generate.vcproj | 74 --- > build/msvc/msvc-generate/msvc-generate.vcxproj | 69 +++ > msvc-build.bat | 27 +- > msvc-dev.bat | 19 +- > msvc-env.bat | 7 +- > openvpn.sln | 90 ++-- > src/compat/Makefile.am | 3 +- > src/compat/compat.vcproj | 197 ------ > src/compat/compat.vcxproj | 87 +++ > src/compat/compat.vcxproj.filters | 42 ++ > src/openvpn/Makefile.am | 3 +- > src/openvpn/openvpn.vcproj | 777 ------------------= ------ > src/openvpn/openvpn.vcxproj | 261 ++++++++ > src/openvpn/openvpn.vcxproj.filters | 458 ++++++++++++++ > src/openvpnserv/Makefile.am | 3 +- > src/openvpnserv/openvpnserv.vcproj | 209 ------- > src/openvpnserv/openvpnserv.vcxproj | 112 ++++ > src/openvpnserv/openvpnserv.vcxproj.filters | 35 ++ > 20 files changed, 1153 insertions(+), 1324 deletions(-) > delete mode 100644 build/msvc/msvc-generate/msvc-generate.vcproj > create mode 100644 build/msvc/msvc-generate/msvc-generate.vcxproj > delete mode 100644 src/compat/compat.vcproj > create mode 100644 src/compat/compat.vcxproj > create mode 100644 src/compat/compat.vcxproj.filters > delete mode 100644 src/openvpn/openvpn.vcproj > create mode 100644 src/openvpn/openvpn.vcxproj > create mode 100644 src/openvpn/openvpn.vcxproj.filters > delete mode 100644 src/openvpnserv/openvpnserv.vcproj > create mode 100644 src/openvpnserv/openvpnserv.vcxproj > create mode 100644 src/openvpnserv/openvpnserv.vcxproj.filters > > diff --git a/.gitignore b/.gitignore > index 2f72ed8..60b9433 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -10,6 +10,8 @@ > *.suo > *.ncb > *.vcproj.* > +*.vcxproj.user > +*.sln.cache > *.log > Release > Debug > diff --git a/build/msvc/msvc-generate/Makefile.am b/build/msvc/msvc-gener= ate/Makefile.am > index 035ae22..539fb6c 100644 > --- a/build/msvc/msvc-generate/Makefile.am > +++ b/build/msvc/msvc-generate/Makefile.am > @@ -13,6 +13,6 @@ MAINTAINERCLEANFILES =3D \ > $(srcdir)/Makefile.in > > dist_noinst_DATA =3D \ > - msvc-generate.vcproj \ > + msvc-generate.vcxproj \ > Makefile.mak \ > msvc-generate.js > diff --git a/build/msvc/msvc-generate/msvc-generate.vcproj b/build/msvc/m= svc-generate/msvc-generate.vcproj > deleted file mode 100644 > index 3b7dc18..0000000 > --- a/build/msvc/msvc-generate/msvc-generate.vcproj > +++ /dev/null > @@ -1,74 +0,0 @@ > - > - - ProjectType=3D"Visual C++" > - Version=3D"9.00" > - Name=3D"msvc-generate" > - ProjectGUID=3D"{8598C2C8-34C4-47A1-99B0-7C295A890615}" > - RootNamespace=3D"msvc-generate" > - Keyword=3D"MakeFileProj" > - TargetFrameworkVersion=3D"196613" > - > > - > - - Name=3D"Win32" > - /> > - > - > - > - > - - Name=3D"Debug|Win32" > - OutputDirectory=3D"$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"0" > - > > - - Name=3D"VCNMakeTool" > - BuildCommandLine=3D"nmake -f Makefile.mak= all" > - ReBuildCommandLine=3D"nmake -f Makefile.m= ak clean all" > - CleanCommandLine=3D"nmake -f Makefile.mak= clean" > - Output=3D"config-msvc-version.h" > - PreprocessorDefinitions=3D"WIN32;_DEBUG" > - IncludeSearchPath=3D"" > - ForcedIncludes=3D"" > - AssemblySearchPath=3D"" > - ForcedUsingAssemblies=3D"" > - CompileAsManaged=3D"" > - /> > - > - - Name=3D"Release|Win32" > - OutputDirectory=3D"$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"0" > - > > - - Name=3D"VCNMakeTool" > - BuildCommandLine=3D"nmake -f Makefile.mak= all" > - ReBuildCommandLine=3D"nmake -f Makefile.m= ak clean all" > - CleanCommandLine=3D"nmake -f Makefile.mak= clean" > - Output=3D"config-msvc-version.h" > - PreprocessorDefinitions=3D"WIN32;NDEBUG" > - IncludeSearchPath=3D"" > - ForcedIncludes=3D"" > - AssemblySearchPath=3D"" > - ForcedUsingAssemblies=3D"" > - CompileAsManaged=3D"" > - /> > - > - > - > - > - > - - RelativePath=3D".\Makefile.mak" > - > > - > - - RelativePath=3D".\msc-generate.js" > - > > - > - > - > - > - > diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj b/build/msvc/= msvc-generate/msvc-generate.vcxproj > new file mode 100644 > index 0000000..e6491ab > --- /dev/null > +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj > @@ -0,0 +1,69 @@ > +=EF=BB=BF > + > + > + > + Debug > + Win32 > + > + > + Release > + Win32 > + > + > + > + {8598C2C8-34C4-47A1-99B0-7C295A890615} > + msvc-generate > + MakeFileProj > + > + > + > + Makefile > + > + > + Makefile > + > + > + > + > + > + > + > + > + > + > + > + > + <_ProjectFileVersion>10.0.30319.1 > + $(Configuration)\ > + $(Configuration)\ > + nmake -f Makefile.mak all > + nmake -f Makefile.mak clean all > + nmake -f Makefile.mak clean > + config-msvc-version.h > + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) > + $(NMakeIncludeSearchPath) > + $(NMakeForcedIncludes) > + $(NMakeAssemblySearchPath) > + $(NMakeForcedUsingAssemblies) > + $(Configuration)\ > + $(Configuration)\ > + nmake -f Makefile.mak all > + nmake -f Makefile.mak clean all > + nmake -f Makefile.mak clean > + config-msvc-version.h > + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) > + $(NMakeIncludeSearchPath) > + $(NMakeForcedIncludes) > + $(NMakeAssemblySearchPath) > + $(NMakeForcedUsingAssemblies) > + > + > + > + > + > + > + > + > + > + > + > \ No newline at end of file > diff --git a/msvc-build.bat b/msvc-build.bat > index 02a396c..01417d1 100644 > --- a/msvc-build.bat > +++ b/msvc-build.bat > @@ -1,23 +1,37 @@ > @echo off > - > rem Copyright (C) 2008-2012 Alon Bar-Lev > > -call msvc-env.bat > - > @rem this stupid command needed for SetEnv.cmd to operate > setlocal ENABLEDELAYEDEXPANSION > > +call msvc-env.bat > + > set PLATFORMS=3DWin32 > set CONFIGURATIONS=3DRelease > > -call "%VCHOME%\bin\vcvars32.bat" > +if exist "%VCHOME%\vcvarsall.bat" ( > + call "%VCHOME%\vcvarsall.bat" > +) else if exist "%VCHOME%\bin\vcvars32.bat" ( > + call "%VCHOME%\bin\vcvars32.bat" > +) else ( > + echo Cannot detect visual studio > + goto error > +) > + > +msbuild /help > nul 2>&1 > +if errorlevel 1 set DO_VCBUILD=3D1 > > for %%p in (%PLATFORMS%) do ( > for %%c in (%CONFIGURATIONS%) do ( > rmdir /q /s %SOURCEBASE%\%%p\%%c > nul 2>&1 > > - vcbuild /errfile:error.log /showenv %SOLUTION% /rebuild /= platform:%%p "%%c|%%p" > - for %%f in (error.log) do if %%~zf GTR 0 goto error > + if "%DO_VCBUILD%" NEQ "" ( > + vcbuild /errfile:error.log /showenv "%SOLUTION%" = /rebuild /platform:%%p "%%c|%%p" > + for %%f in (error.log) do if %%~zf GTR 0 goto err= or > + ) else ( > + msbuild "%SOLUTION%" /p:Configuration=3D"%%c" /p:= Platform=3D"%%p" > + if errorlevel 1 goto error > + ) > ) > ) > > @@ -25,7 +39,6 @@ exit /b 0 > goto end > > :error > -if "%1" NEQ "batch" pause > exit /b 1 > goto end > > diff --git a/msvc-dev.bat b/msvc-dev.bat > index 671a56d..4dac172 100644 > --- a/msvc-dev.bat > +++ b/msvc-dev.bat > @@ -4,6 +4,23 @@ setlocal > cd %0\.. > call msvc-env.bat > > -start "" "%VSHOME%\Common7\IDE\devenv.exe" %SOLUTION% > +if exist "%VSHOME%\Common7\IDE\VCExpress.exe" ( > + set IDE=3D%VSHOME%\Common7\IDE\VCExpress.exe > +) else if exist "%VSHOME%\Common7\IDE\devenv.exe" ( > + set IDE=3D%VSHOME%\Common7\IDE\devenv.exe > +) else ( > + echo "Cannot detect visual studio environment" > + goto error > +) > +start "" "%IDE%" "%SOLUTION%" > + > +exit /b 0 > +goto end > + > +:error > +exit /b 1 > +goto end > + > +:end > > endlocal > diff --git a/msvc-env.bat b/msvc-env.bat > index e37757b..3c9eb5b 100644 > --- a/msvc-env.bat > +++ b/msvc-env.bat > @@ -6,9 +6,10 @@ rem Put your own settings at msvc-env-local.bat > if exist msvc-env-local.bat call msvc-env-local.bat > > if "%ProgramFiles(x86)%"=3D=3D"" set ProgramFiles(x86)=3D%ProgramFiles% > -if "%VS90COMNTOOLS%"=3D=3D"" set VS90COMNTOOLS=3D%ProgramFiles(x86)%\Mic= rosoft Visual Studio 9.0\Common7\Tools\ > -if "%VSHOME%"=3D=3D"" set VSHOME=3D%VS90COMNTOOLS%..\.. > -if "%VCHOME%"=3D=3D"" set VCHOME=3D%VSHOME%\VC > +if "%VSCOMNTOOLS%"=3D=3D"" SET VSCOMNTOOLS=3D%ProgramFiles(x86)%\Microso= ft Visual Studio 10.0\Common7\Tools > +if "%VSCOMNTOOLS%"=3D=3D"" SET VSCOMNTOOLS=3D%ProgramFiles(x86)%\Microso= ft Visual Studio 9.0\Common7\Tools > +if "%VSHOME%"=3D=3D"" SET VSHOME=3D%VSCOMNTOOLS%\..\.. > +if "%VCHOME%"=3D=3D"" SET VCHOME=3D%VSHOME%\VC > > set SOURCEBASE=3D%cd% > set SOLUTION=3Dopenvpn.sln > diff --git a/openvpn.sln b/openvpn.sln > index be35d16..f832e7a 100644 > --- a/openvpn.sln > +++ b/openvpn.sln > @@ -1,52 +1,38 @@ > -=EF=BB=BF > -Microsoft Visual Studio Solution File, Format Version 10.00 > -# Visual Studio 2008 > -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "openvpnserv", "sr= c\openvpnserv\openvpnserv.vcproj", "{9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}" > - ProjectSection(ProjectDependencies) =3D postProject > - {8598C2C8-34C4-47A1-99B0-7C295A890615} =3D {8598C2C8-34C4= -47A1-99B0-7C295A890615} > - EndProjectSection > -EndProject > -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "openvpn", "src\op= envpn\openvpn.vcproj", "{29DF226E-4D4E-440F-ADAF-5829CFD4CA94}" > - ProjectSection(ProjectDependencies) =3D postProject > - {4B2E2719-E661-45D7-9203-F6F456B22F19} =3D {4B2E2719-E661= -45D7-9203-F6F456B22F19} > - {8598C2C8-34C4-47A1-99B0-7C295A890615} =3D {8598C2C8-34C4= -47A1-99B0-7C295A890615} > - EndProjectSection > -EndProject > -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") =3D "misc", "misc", "{= 1AA03DE8-3F08-45B9-B4ED-D7769A445DF3}" > - ProjectSection(SolutionItems) =3D preProject > - config-msvc-version.h.in =3D config-msvc-version.h.in > - config-msvc.h =3D config-msvc.h > - version.m4 =3D version.m4 > - EndProjectSection > -EndProject > -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "msvc-generate", "= build\msvc\msvc-generate\msvc-generate.vcproj", "{8598C2C8-34C4-47A1-99B0-7= C295A890615}" > -EndProject > -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "compat", "src\com= pat\compat.vcproj", "{4B2E2719-E661-45D7-9203-F6F456B22F19}" > -EndProject > -Global > - GlobalSection(SolutionConfigurationPlatforms) =3D preSolution > - Debug|Win32 =3D Debug|Win32 > - Release|Win32 =3D Release|Win32 > - EndGlobalSection > - GlobalSection(ProjectConfigurationPlatforms) =3D postSolution > - {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.Active= Cfg =3D Debug|Win32 > - {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.Build.= 0 =3D Debug|Win32 > - {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Acti= veCfg =3D Release|Win32 > - {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Buil= d.0 =3D Release|Win32 > - {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.Active= Cfg =3D Debug|Win32 > - {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.Build.= 0 =3D Debug|Win32 > - {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.Acti= veCfg =3D Release|Win32 > - {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.Buil= d.0 =3D Release|Win32 > - {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Active= Cfg =3D Debug|Win32 > - {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Build.= 0 =3D Debug|Win32 > - {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.Acti= veCfg =3D Release|Win32 > - {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.Buil= d.0 =3D Release|Win32 > - {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.Active= Cfg =3D Debug|Win32 > - {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.Build.= 0 =3D Debug|Win32 > - {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.Acti= veCfg =3D Release|Win32 > - {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.Buil= d.0 =3D Release|Win32 > - EndGlobalSection > - GlobalSection(SolutionProperties) =3D preSolution > - HideSolutionNode =3D FALSE > - EndGlobalSection > -EndGlobal > +=EF=BB=BF > +Microsoft Visual Studio Solution File, Format Version 11.00 > +# Visual C++ Express 2010 > +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "openvpnserv", "sr= c\openvpnserv\openvpnserv.vcxproj", "{9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}" > +EndProject > +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "openvpn", "src\op= envpn\openvpn.vcxproj", "{29DF226E-4D4E-440F-ADAF-5829CFD4CA94}" > +EndProject > +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "msvc-generate", "= build\msvc\msvc-generate\msvc-generate.vcxproj", "{8598C2C8-34C4-47A1-99B0-= 7C295A890615}" > +EndProject > +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "compat", "src\com= pat\compat.vcxproj", "{4B2E2719-E661-45D7-9203-F6F456B22F19}" > +EndProject > +Global > + GlobalSection(SolutionConfigurationPlatforms) =3D preSolution > + Debug|Win32 =3D Debug|Win32 > + Release|Win32 =3D Release|Win32 > + EndGlobalSection > + GlobalSection(ProjectConfigurationPlatforms) =3D postSolution > + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.Active= Cfg =3D Debug|Win32 > + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.Build.= 0 =3D Debug|Win32 > + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Acti= veCfg =3D Release|Win32 > + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Buil= d.0 =3D Release|Win32 > + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.Active= Cfg =3D Debug|Win32 > + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.Build.= 0 =3D Debug|Win32 > + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.Acti= veCfg =3D Release|Win32 > + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.Buil= d.0 =3D Release|Win32 > + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Active= Cfg =3D Debug|Win32 > + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Build.= 0 =3D Debug|Win32 > + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.Acti= veCfg =3D Release|Win32 > + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.Buil= d.0 =3D Release|Win32 > + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.Active= Cfg =3D Debug|Win32 > + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.Build.= 0 =3D Debug|Win32 > + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.Acti= veCfg =3D Release|Win32 > + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.Buil= d.0 =3D Release|Win32 > + EndGlobalSection > + GlobalSection(SolutionProperties) =3D preSolution > + HideSolutionNode =3D FALSE > + EndGlobalSection > +EndGlobal > diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am > index 91b7f40..5ee35f7 100644 > --- a/src/compat/Makefile.am > +++ b/src/compat/Makefile.am > @@ -13,7 +13,8 @@ MAINTAINERCLEANFILES =3D \ > $(srcdir)/Makefile.in > > EXTRA_DIST =3D \ > - compat.vcproj > + compat.vcxproj \ > + compat.vcxproj.filters > > noinst_LTLIBRARIES =3D libcompat.la > > diff --git a/src/compat/compat.vcproj b/src/compat/compat.vcproj > deleted file mode 100644 > index 43fc0c2..0000000 > --- a/src/compat/compat.vcproj > +++ /dev/null > @@ -1,197 +0,0 @@ > - > - - ProjectType=3D"Visual C++" > - Version=3D"9.00" > - Name=3D"compat" > - ProjectGUID=3D"{4B2E2719-E661-45D7-9203-F6F456B22F19}" > - RootNamespace=3D"compat" > - Keyword=3D"Win32Proj" > - TargetFrameworkVersion=3D"196613" > - > > - > - - Name=3D"Win32" > - /> > - > - > - > - > - - Name=3D"Debug|Win32" > - OutputDirectory=3D"$(SolutionDir)$(PlatformName)-= Output\$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"4" > - CharacterSet=3D"2" > - > > - - Name=3D"VCPreBuildEventTool" > - /> > - - Name=3D"VCCustomBuildTool" > - /> > - - Name=3D"VCXMLDataGeneratorTool" > - /> > - - Name=3D"VCWebServiceProxyGeneratorTool" > - /> > - - Name=3D"VCMIDLTool" > - /> > - - Name=3D"VCCLCompilerTool" > - Optimization=3D"0" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PK= CS11H_HOME)/include" > - PreprocessorDefinitions=3D"WIN32;_DEBUG;_= LIB;$(CPPFLAGS)" > - MinimalRebuild=3D"true" > - BasicRuntimeChecks=3D"3" > - RuntimeLibrary=3D"3" > - UsePrecompiledHeader=3D"0" > - WarningLevel=3D"3" > - DebugInformationFormat=3D"4" > - /> > - - Name=3D"VCManagedResourceCompilerTool" > - /> > - - Name=3D"VCResourceCompilerTool" > - /> > - - Name=3D"VCPreLinkEventTool" > - /> > - - Name=3D"VCLibrarianTool" > - /> > - - Name=3D"VCALinkTool" > - /> > - - Name=3D"VCXDCMakeTool" > - /> > - - Name=3D"VCBscMakeTool" > - /> > - - Name=3D"VCFxCopTool" > - /> > - - Name=3D"VCPostBuildEventTool" > - /> > - > - - Name=3D"Release|Win32" > - OutputDirectory=3D"$(SolutionDir)$(PlatformName)-= Output\$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"4" > - CharacterSet=3D"2" > - WholeProgramOptimization=3D"1" > - > > - - Name=3D"VCPreBuildEventTool" > - /> > - - Name=3D"VCCustomBuildTool" > - /> > - - Name=3D"VCXMLDataGeneratorTool" > - /> > - - Name=3D"VCWebServiceProxyGeneratorTool" > - /> > - - Name=3D"VCMIDLTool" > - /> > - - Name=3D"VCCLCompilerTool" > - Optimization=3D"2" > - EnableIntrinsicFunctions=3D"true" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PK= CS11H_HOME)/include" > - PreprocessorDefinitions=3D"WIN32;NDEBUG;_= LIB;$(CPPFLAGS)" > - RuntimeLibrary=3D"2" > - EnableFunctionLevelLinking=3D"true" > - UsePrecompiledHeader=3D"0" > - WarningLevel=3D"3" > - DebugInformationFormat=3D"3" > - /> > - - Name=3D"VCManagedResourceCompilerTool" > - /> > - - Name=3D"VCResourceCompilerTool" > - /> > - - Name=3D"VCPreLinkEventTool" > - /> > - - Name=3D"VCLibrarianTool" > - /> > - - Name=3D"VCALinkTool" > - /> > - - Name=3D"VCXDCMakeTool" > - /> > - - Name=3D"VCBscMakeTool" > - /> > - - Name=3D"VCFxCopTool" > - /> > - - Name=3D"VCPostBuildEventTool" > - /> > - > - > - > - > - > - - Name=3D"Source Files" > - Filter=3D"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;as= mx" > - UniqueIdentifier=3D"{4FC737F1-C7A5-4376-A066-2A32= D752A2FF}" > - > > - - RelativePath=3D".\compat-basename.c" > - > > - > - - RelativePath=3D".\compat-dirname.c" > - > > - > - - RelativePath=3D".\compat-gettimeofday.c" > - > > - > - - RelativePath=3D".\compat-inet_ntop.c" > - > > - > - - RelativePath=3D".\compat-inet_pton.c" > - > > - > - - RelativePath=3D".\compat-daemon.c" > - > > - > - > - - Name=3D"Header Files" > - Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" > - UniqueIdentifier=3D"{93995380-89BD-4b04-88EB-625F= BE52EBFB}" > - > > - - RelativePath=3D".\compat.h" > - > > - > - > - - Name=3D"Resource Files" > - Filter=3D"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;= jpg;jpeg;jpe;resx;tiff;tif;png;wav" > - UniqueIdentifier=3D"{67DA6AB6-F800-4c08-8B7A-83BB= 121AAD01}" > - > > - > - > - > - > - > diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj > new file mode 100644 > index 0000000..d872fa7 > --- /dev/null > +++ b/src/compat/compat.vcxproj > @@ -0,0 +1,87 @@ > +=EF=BB=BF > + > + > + > + Debug > + Win32 > + > + > + Release > + Win32 > + > + > + > + {4B2E2719-E661-45D7-9203-F6F456B22F19} > + compat > + Win32Proj > + > + > + > + StaticLibrary > + MultiByte > + true > + > + > + StaticLibrary > + MultiByte > + > + > + > + > + > + > + > + > + > + > + > + > + <_ProjectFileVersion>10.0.30319.1 > + $(SolutionDir)$(Platform)-Output\$(Configuration)\ > + $(Configuration)\ > + $(SolutionDir)$(Platform)-Output\$(Configuration)\ > + $(Configuration)\ > + > + > + > + Disabled > + $(SOURCEBASE);$(SOURCEBASE)/include;= $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(Addit= ionalIncludeDirectories) > + WIN32;_DEBUG;_LIB;$(CPPFLAGS);%(Preproces= sorDefinitions) > + true > + EnableFastChecks > + MultiThreadedDebugDLL > + > + > + Level3 > + EditAndContinue > + > + > + > + > + MaxSpeed > + true > + $(SOURCEBASE);$(SOURCEBASE)/include;= $(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(Addit= ionalIncludeDirectories) > + WIN32;NDEBUG;_LIB;$(CPPFLAGS);%(Preproces= sorDefinitions) > + MultiThreadedDLL > + true > + > + > + Level3 > + ProgramDatabase > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > \ No newline at end of file > diff --git a/src/compat/compat.vcxproj.filters b/src/compat/compat.vcxpro= j.filters > new file mode 100644 > index 0000000..9576c51 > --- /dev/null > +++ b/src/compat/compat.vcxproj.filters > @@ -0,0 +1,42 @@ > +=EF=BB=BF > + > + > + > + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} > + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx > + > + > + {93995380-89BD-4b04-88EB-625FBE52EBFB} > + h;hpp;hxx;hm;inl;inc;xsd > + > + > + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} > + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;re= sx;tiff;tif;png;wav > + > + > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + > + > + Header Files > + > + > + > \ No newline at end of file > diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am > index 1410021..4e485e7 100644 > --- a/src/openvpn/Makefile.am > +++ b/src/openvpn/Makefile.am > @@ -15,7 +15,8 @@ MAINTAINERCLEANFILES =3D \ > $(srcdir)/Makefile.in > > EXTRA_DIST =3D \ > - openvpn.vcproj > + openvpn.vcxproj \ > + openvpn.vcxproj.filters > > INCLUDES =3D \ > -I$(top_srcdir)/include \ > diff --git a/src/openvpn/openvpn.vcproj b/src/openvpn/openvpn.vcproj > deleted file mode 100644 > index c1aa8a0..0000000 > --- a/src/openvpn/openvpn.vcproj > +++ /dev/null > @@ -1,777 +0,0 @@ > - > - - ProjectType=3D"Visual C++" > - Version=3D"9.00" > - Name=3D"openvpn" > - ProjectGUID=3D"{29DF226E-4D4E-440F-ADAF-5829CFD4CA94}" > - RootNamespace=3D"openvpn" > - Keyword=3D"Win32Proj" > - TargetFrameworkVersion=3D"196613" > - > > - > - - Name=3D"Win32" > - /> > - > - > - > - > - - Name=3D"Debug|Win32" > - OutputDirectory=3D"$(SolutionDir)$(PlatformName)-= Output\$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"1" > - CharacterSet=3D"2" > - > > - - Name=3D"VCPreBuildEventTool" > - /> > - - Name=3D"VCCustomBuildTool" > - /> > - - Name=3D"VCXMLDataGeneratorTool" > - /> > - - Name=3D"VCWebServiceProxyGeneratorTool" > - /> > - - Name=3D"VCMIDLTool" > - /> > - - Name=3D"VCCLCompilerTool" > - Optimization=3D"0" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE);$(SOURCEBASE)/src/compat;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/inc= lude;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include" > - PreprocessorDefinitions=3D"WIN32;_DEBUG;_= CONSOLE;$(CPPFLAGS)" > - MinimalRebuild=3D"true" > - BasicRuntimeChecks=3D"3" > - RuntimeLibrary=3D"3" > - UsePrecompiledHeader=3D"0" > - WarningLevel=3D"3" > - DebugInformationFormat=3D"4" > - /> > - - Name=3D"VCManagedResourceCompilerTool" > - /> > - - Name=3D"VCResourceCompilerTool" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE)" > - /> > - - Name=3D"VCPreLinkEventTool" > - /> > - - Name=3D"VCLinkerTool" > - AdditionalDependencies=3D"libeay32.lib ss= leay32.lib lzo2.lib pkcs11-helper.dll.lib gdi32.lib ws2_32.lib wininet.lib = crypt32.lib iphlpapi.lib winmm.lib shell32.lib" > - LinkIncremental=3D"2" > - AdditionalLibraryDirectories=3D"$(OPENSSL= _HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib" > - GenerateDebugInformation=3D"true" > - SubSystem=3D"1" > - TargetMachine=3D"1" > - /> > - - Name=3D"VCALinkTool" > - /> > - - Name=3D"VCManifestTool" > - /> > - - Name=3D"VCXDCMakeTool" > - /> > - - Name=3D"VCBscMakeTool" > - /> > - - Name=3D"VCFxCopTool" > - /> > - - Name=3D"VCAppVerifierTool" > - /> > - - Name=3D"VCPostBuildEventTool" > - /> > - > - - Name=3D"Release|Win32" > - OutputDirectory=3D"$(SolutionDir)$(PlatformName)-= Output\$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"1" > - CharacterSet=3D"2" > - WholeProgramOptimization=3D"1" > - > > - - Name=3D"VCPreBuildEventTool" > - /> > - - Name=3D"VCCustomBuildTool" > - /> > - - Name=3D"VCXMLDataGeneratorTool" > - /> > - - Name=3D"VCWebServiceProxyGeneratorTool" > - /> > - - Name=3D"VCMIDLTool" > - /> > - - Name=3D"VCCLCompilerTool" > - Optimization=3D"2" > - EnableIntrinsicFunctions=3D"true" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE);$(SOURCEBASE)/src/compat;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/inc= lude;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include" > - PreprocessorDefinitions=3D"WIN32;NDEBUG;_= CONSOLE;$(CPPFLAGS)" > - RuntimeLibrary=3D"2" > - EnableFunctionLevelLinking=3D"true" > - UsePrecompiledHeader=3D"0" > - WarningLevel=3D"3" > - DebugInformationFormat=3D"3" > - /> > - - Name=3D"VCManagedResourceCompilerTool" > - /> > - - Name=3D"VCResourceCompilerTool" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE)" > - /> > - - Name=3D"VCPreLinkEventTool" > - /> > - - Name=3D"VCLinkerTool" > - AdditionalDependencies=3D"libeay32.lib ss= leay32.lib lzo2.lib pkcs11-helper.dll.lib gdi32.lib ws2_32.lib wininet.lib = crypt32.lib iphlpapi.lib winmm.lib shell32.lib" > - LinkIncremental=3D"1" > - AdditionalLibraryDirectories=3D"$(OPENSSL= _HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib" > - GenerateDebugInformation=3D"true" > - SubSystem=3D"1" > - OptimizeReferences=3D"2" > - EnableCOMDATFolding=3D"2" > - TargetMachine=3D"1" > - /> > - - Name=3D"VCALinkTool" > - /> > - - Name=3D"VCManifestTool" > - /> > - - Name=3D"VCXDCMakeTool" > - /> > - - Name=3D"VCBscMakeTool" > - /> > - - Name=3D"VCFxCopTool" > - /> > - - Name=3D"VCAppVerifierTool" > - /> > - - Name=3D"VCPostBuildEventTool" > - /> > - > - > - > - > - > - - Name=3D"Source Files" > - Filter=3D"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;as= mx" > - UniqueIdentifier=3D"{4FC737F1-C7A5-4376-A066-2A32= D752A2FF}" > - > > - - RelativePath=3D".\base64.c" > - > > - > - - RelativePath=3D".\buffer.c" > - > > - > - - RelativePath=3D".\clinat.c" > - > > - > - - RelativePath=3D".\console.c" > - > > - > - - RelativePath=3D".\crypto.c" > - > > - > - - RelativePath=3D".\crypto_openssl.c" > - > > - > - - RelativePath=3D".\cryptoapi.c" > - > > - > - - RelativePath=3D".\dhcp.c" > - > > - > - - RelativePath=3D".\error.c" > - > > - > - - RelativePath=3D".\event.c" > - > > - > - - RelativePath=3D".\fdmisc.c" > - > > - > - - RelativePath=3D".\forward.c" > - > > - > - - RelativePath=3D".\fragment.c" > - > > - > - - RelativePath=3D".\gremlin.c" > - > > - > - - RelativePath=3D".\helper.c" > - > > - > - - RelativePath=3D".\httpdigest.c" > - > > - > - - RelativePath=3D".\init.c" > - > > - > - - RelativePath=3D".\interval.c" > - > > - > - - RelativePath=3D".\list.c" > - > > - > - - RelativePath=3D".\lladdr.c" > - > > - > - - RelativePath=3D".\lzo.c" > - > > - > - - RelativePath=3D".\manage.c" > - > > - > - - RelativePath=3D".\mbuf.c" > - > > - > - - RelativePath=3D".\misc.c" > - > > - > - - RelativePath=3D".\mroute.c" > - > > - > - - RelativePath=3D".\mss.c" > - > > - > - - RelativePath=3D".\mstats.c" > - > > - > - - RelativePath=3D".\mtcp.c" > - > > - > - - RelativePath=3D".\mtu.c" > - > > - > - - RelativePath=3D".\mudp.c" > - > > - > - - RelativePath=3D".\multi.c" > - > > - > - - RelativePath=3D".\ntlm.c" > - > > - > - - RelativePath=3D".\occ.c" > - > > - > - - RelativePath=3D".\openvpn.c" > - > > - > - - RelativePath=3D".\options.c" > - > > - > - - RelativePath=3D".\otime.c" > - > > - > - - RelativePath=3D".\packet_id.c" > - > > - > - - RelativePath=3D".\perf.c" > - > > - > - - RelativePath=3D".\pf.c" > - > > - > - - RelativePath=3D".\ping.c" > - > > - > - - RelativePath=3D".\pkcs11.c" > - > > - > - - RelativePath=3D".\pkcs11_openssl.c" > - > > - > - - RelativePath=3D".\platform.c" > - > > - > - - RelativePath=3D".\plugin.c" > - > > - > - - RelativePath=3D".\pool.c" > - > > - > - - RelativePath=3D".\proto.c" > - > > - > - - RelativePath=3D".\proxy.c" > - > > - > - - RelativePath=3D".\ps.c" > - > > - > - - RelativePath=3D".\push.c" > - > > - > - - RelativePath=3D".\reliable.c" > - > > - > - - RelativePath=3D".\route.c" > - > > - > - - RelativePath=3D".\schedule.c" > - > > - > - - RelativePath=3D".\session_id.c" > - > > - > - - RelativePath=3D".\shaper.c" > - > > - > - - RelativePath=3D".\sig.c" > - > > - > - - RelativePath=3D".\socket.c" > - > > - > - - RelativePath=3D".\socks.c" > - > > - > - - RelativePath=3D".\ssl.c" > - > > - > - - RelativePath=3D".\ssl_openssl.c" > - > > - > - - RelativePath=3D".\ssl_verify.c" > - > > - > - - RelativePath=3D".\ssl_verify_openssl.c" > - > > - > - - RelativePath=3D".\status.c" > - > > - > - - RelativePath=3D".\tun.c" > - > > - > - - RelativePath=3D".\win32.c" > - > > - > - > - - Name=3D"Header Files" > - Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" > - UniqueIdentifier=3D"{93995380-89BD-4b04-88EB-625F= BE52EBFB}" > - > > - - RelativePath=3D".\base64.h" > - > > - > - - RelativePath=3D".\basic.h" > - > > - > - - RelativePath=3D".\buffer.h" > - > > - > - - RelativePath=3D".\circ_list.h" > - > > - > - - RelativePath=3D".\clinat.h" > - > > - > - - RelativePath=3D".\common.h" > - > > - > - - RelativePath=3D".\console.h" > - > > - > - - RelativePath=3D".\crypto.h" > - > > - > - - RelativePath=3D".\crypto_backend.h" > - > > - > - - RelativePath=3D".\crypto_openssl.h" > - > > - > - - RelativePath=3D".\cryptoapi.h" > - > > - > - - RelativePath=3D".\dhcp.h" > - > > - > - - RelativePath=3D".\errlevel.h" > - > > - > - - RelativePath=3D".\error.h" > - > > - > - - RelativePath=3D".\event.h" > - > > - > - - RelativePath=3D".\fdmisc.h" > - > > - > - - RelativePath=3D".\forward-inline.h" > - > > - > - - RelativePath=3D".\forward.h" > - > > - > - - RelativePath=3D".\fragment.h" > - > > - > - - RelativePath=3D".\gremlin.h" > - > > - > - - RelativePath=3D".\helper.h" > - > > - > - - RelativePath=3D".\httpdigest.h" > - > > - > - - RelativePath=3D".\init.h" > - > > - > - - RelativePath=3D".\integer.h" > - > > - > - - RelativePath=3D".\interval.h" > - > > - > - - RelativePath=3D".\list.h" > - > > - > - - RelativePath=3D".\lladdr.h" > - > > - > - - RelativePath=3D".\lzo.h" > - > > - > - - RelativePath=3D".\manage.h" > - > > - > - - RelativePath=3D".\mbuf.h" > - > > - > - - RelativePath=3D".\memdbg.h" > - > > - > - - RelativePath=3D".\misc.h" > - > > - > - - RelativePath=3D".\mroute.h" > - > > - > - - RelativePath=3D".\mss.h" > - > > - > - - RelativePath=3D".\mstats.h" > - > > - > - - RelativePath=3D".\mtcp.h" > - > > - > - - RelativePath=3D".\mtu.h" > - > > - > - - RelativePath=3D".\mudp.h" > - > > - > - - RelativePath=3D".\multi.h" > - > > - > - - RelativePath=3D".\ntlm.h" > - > > - > - - RelativePath=3D".\occ-inline.h" > - > > - > - - RelativePath=3D".\occ.h" > - > > - > - - RelativePath=3D".\openvpn.h" > - > > - > - - RelativePath=3D".\options.h" > - > > - > - - RelativePath=3D".\otime.h" > - > > - > - - RelativePath=3D".\packet_id.h" > - > > - > - - RelativePath=3D".\perf.h" > - > > - > - - RelativePath=3D".\pf-inline.h" > - > > - > - - RelativePath=3D".\pf.h" > - > > - > - - RelativePath=3D".\ping-inline.h" > - > > - > - - RelativePath=3D".\ping.h" > - > > - > - - RelativePath=3D".\pkcs11.h" > - > > - > - - RelativePath=3D".\pkcs11_backend.h" > - > > - > - - RelativePath=3D".\platform.h" > - > > - > - - RelativePath=3D".\plugin.h" > - > > - > - - RelativePath=3D".\pool.h" > - > > - > - - RelativePath=3D".\proto.h" > - > > - > - - RelativePath=3D".\proxy.h" > - > > - > - - RelativePath=3D".\ps.h" > - > > - > - - RelativePath=3D".\push.h" > - > > - > - - RelativePath=3D".\pushlist.h" > - > > - > - - RelativePath=3D".\reliable.h" > - > > - > - - RelativePath=3D".\route.h" > - > > - > - - RelativePath=3D".\schedule.h" > - > > - > - - RelativePath=3D".\session_id.h" > - > > - > - - RelativePath=3D".\shaper.h" > - > > - > - - RelativePath=3D".\sig.h" > - > > - > - - RelativePath=3D".\socket.h" > - > > - > - - RelativePath=3D".\socks.h" > - > > - > - - RelativePath=3D".\ssl.h" > - > > - > - - RelativePath=3D".\ssl_backend.h" > - > > - > - - RelativePath=3D".\ssl_common.h" > - > > - > - - RelativePath=3D".\ssl_openssl.h" > - > > - > - - RelativePath=3D".\ssl_verify.h" > - > > - > - - RelativePath=3D".\ssl_verify_backend.h" > - > > - > - - RelativePath=3D".\ssl_verify_openssl.h" > - > > - > - - RelativePath=3D".\status.h" > - > > - > - - RelativePath=3D".\syshead.h" > - > > - > - - RelativePath=3D".\tun.h" > - > > - > - - RelativePath=3D".\win32.h" > - > > - > - > - - Name=3D"Resource Files" > - Filter=3D"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;= jpg;jpeg;jpe;resx;tiff;tif;png;wav" > - UniqueIdentifier=3D"{67DA6AB6-F800-4c08-8B7A-83BB= 121AAD01}" > - > > - - RelativePath=3D".\openvpn_win32_resources= .rc" > - > > - > - > - > - > - > - > diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj > new file mode 100644 > index 0000000..51e19af > --- /dev/null > +++ b/src/openvpn/openvpn.vcxproj > @@ -0,0 +1,261 @@ > +=EF=BB=BF > + > + > + > + Debug > + Win32 > + > + > + Release > + Win32 > + > + > + > + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94} > + openvpn > + Win32Proj > + > + > + > + Application > + MultiByte > + true > + > + > + Application > + MultiByte > + > + > + > + > + > + > + > + > + > + > + > + > + <_ProjectFileVersion>10.0.30319.1 > + $(SolutionDir)$(Platform)-Output\$(Configuration)\ > + $(Configuration)\ > + true > + $(SolutionDir)$(Platform)-Output\$(Configuration)\ > + $(Configuration)\ > + false > + > + > + > + Disabled > + $(SOURCEBASE);$(SOURCEBASE)/src/comp= at;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/includ= e;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectorie= s) > + WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(Prepr= ocessorDefinitions) > + true > + EnableFastChecks > + MultiThreadedDebugDLL > + > + > + Level3 > + EditAndContinue > + > + > + $(SOURCEBASE);%(AdditionalIncludeDir= ectories) > + > + > + libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-= helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;wi= nmm.lib;shell32.lib;%(AdditionalDependencies) > + $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;= $(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) > + true > + Console > + MachineX86 > + > + > + > + > + MaxSpeed > + true > + $(SOURCEBASE);$(SOURCEBASE)/src/comp= at;$(SOURCEBASE)/include;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/includ= e;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectorie= s) > + WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(Prepr= ocessorDefinitions) > + MultiThreadedDLL > + true > + > + > + Level3 > + ProgramDatabase > + > + > + $(SOURCEBASE);%(AdditionalIncludeDir= ectories) > + > + > + libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-= helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;wi= nmm.lib;shell32.lib;%(AdditionalDependencies) > + $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;= $(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) > + true > + Console > + true > + true > + MachineX86 > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + {8598c2c8-34c4-47a1-99b0-7c295a890615} > + false > + > + > + {4b2e2719-e661-45d7-9203-f6f456b22f19} > + false > + > + > + > + > + > + > \ No newline at end of file > diff --git a/src/openvpn/openvpn.vcxproj.filters b/src/openvpn/openvpn.vc= xproj.filters > new file mode 100644 > index 0000000..ec5e676 > --- /dev/null > +++ b/src/openvpn/openvpn.vcxproj.filters > @@ -0,0 +1,458 @@ > +=EF=BB=BF > + > + > + > + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} > + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx > + > + > + {93995380-89BD-4b04-88EB-625FBE52EBFB} > + h;hpp;hxx;hm;inl;inc;xsd > + > + > + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} > + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;re= sx;tiff;tif;png;wav > + > + > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + Source Files > + > + > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + Header Files > + > + > + > + > + Resource Files > + > + > + > \ No newline at end of file > diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/Makefile.am > index 8584b06..a989c25 100644 > --- a/src/openvpnserv/Makefile.am > +++ b/src/openvpnserv/Makefile.am > @@ -14,7 +14,8 @@ include $(top_srcdir)/build/ltrc.inc > MAINTAINERCLEANFILES =3D $(srcdir)/Makefile.in > > EXTRA_DIST =3D \ > - openvpnserv.vcproj > + openvpnserv.vcxproj \ > + openvpnserv.vcxproj.filters > > if WIN32 > sbin_PROGRAMS =3D openvpnserv > diff --git a/src/openvpnserv/openvpnserv.vcproj b/src/openvpnserv/openvpn= serv.vcproj > deleted file mode 100644 > index 4c55561..0000000 > --- a/src/openvpnserv/openvpnserv.vcproj > +++ /dev/null > @@ -1,209 +0,0 @@ > - > - - ProjectType=3D"Visual C++" > - Version=3D"9.00" > - Name=3D"openvpnserv" > - ProjectGUID=3D"{9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}" > - RootNamespace=3D"openvpnserv" > - Keyword=3D"Win32Proj" > - TargetFrameworkVersion=3D"196613" > - > > - > - - Name=3D"Win32" > - /> > - > - > - > - > - - Name=3D"Debug|Win32" > - OutputDirectory=3D"$(SolutionDir)$(PlatformName)-= Output\$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"1" > - CharacterSet=3D"2" > - > > - - Name=3D"VCPreBuildEventTool" > - /> > - - Name=3D"VCCustomBuildTool" > - /> > - - Name=3D"VCXMLDataGeneratorTool" > - /> > - - Name=3D"VCWebServiceProxyGeneratorTool" > - /> > - - Name=3D"VCMIDLTool" > - /> > - - Name=3D"VCCLCompilerTool" > - Optimization=3D"0" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE)" > - PreprocessorDefinitions=3D"WIN32;_DEBUG;_= CONSOLE;$(CPPFLAGS)" > - MinimalRebuild=3D"true" > - BasicRuntimeChecks=3D"3" > - RuntimeLibrary=3D"3" > - UsePrecompiledHeader=3D"0" > - WarningLevel=3D"3" > - DebugInformationFormat=3D"4" > - /> > - - Name=3D"VCManagedResourceCompilerTool" > - /> > - - Name=3D"VCResourceCompilerTool" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE)" > - /> > - - Name=3D"VCPreLinkEventTool" > - /> > - - Name=3D"VCLinkerTool" > - LinkIncremental=3D"2" > - GenerateDebugInformation=3D"true" > - SubSystem=3D"1" > - TargetMachine=3D"1" > - /> > - - Name=3D"VCALinkTool" > - /> > - - Name=3D"VCManifestTool" > - /> > - - Name=3D"VCXDCMakeTool" > - /> > - - Name=3D"VCBscMakeTool" > - /> > - - Name=3D"VCFxCopTool" > - /> > - - Name=3D"VCAppVerifierTool" > - /> > - - Name=3D"VCPostBuildEventTool" > - /> > - > - - Name=3D"Release|Win32" > - OutputDirectory=3D"$(SolutionDir)$(PlatformName)-= Output\$(ConfigurationName)" > - IntermediateDirectory=3D"$(ConfigurationName)" > - ConfigurationType=3D"1" > - CharacterSet=3D"2" > - WholeProgramOptimization=3D"1" > - > > - - Name=3D"VCPreBuildEventTool" > - /> > - - Name=3D"VCCustomBuildTool" > - /> > - - Name=3D"VCXMLDataGeneratorTool" > - /> > - - Name=3D"VCWebServiceProxyGeneratorTool" > - /> > - - Name=3D"VCMIDLTool" > - /> > - - Name=3D"VCCLCompilerTool" > - Optimization=3D"2" > - EnableIntrinsicFunctions=3D"true" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE)" > - PreprocessorDefinitions=3D"WIN32;NDEBUG;_= CONSOLE;$(CPPFLAGS)" > - RuntimeLibrary=3D"2" > - EnableFunctionLevelLinking=3D"true" > - UsePrecompiledHeader=3D"0" > - WarningLevel=3D"3" > - DebugInformationFormat=3D"3" > - /> > - - Name=3D"VCManagedResourceCompilerTool" > - /> > - - Name=3D"VCResourceCompilerTool" > - AdditionalIncludeDirectories=3D"$(SOURCEB= ASE)" > - /> > - - Name=3D"VCPreLinkEventTool" > - /> > - - Name=3D"VCLinkerTool" > - LinkIncremental=3D"1" > - GenerateDebugInformation=3D"true" > - SubSystem=3D"1" > - OptimizeReferences=3D"2" > - EnableCOMDATFolding=3D"2" > - TargetMachine=3D"1" > - /> > - - Name=3D"VCALinkTool" > - /> > - - Name=3D"VCManifestTool" > - /> > - - Name=3D"VCXDCMakeTool" > - /> > - - Name=3D"VCBscMakeTool" > - /> > - - Name=3D"VCFxCopTool" > - /> > - - Name=3D"VCAppVerifierTool" > - /> > - - Name=3D"VCPostBuildEventTool" > - /> > - > - > - > - > - > - - Name=3D"Source Files" > - Filter=3D"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;as= mx" > - UniqueIdentifier=3D"{4FC737F1-C7A5-4376-A066-2A32= D752A2FF}" > - > > - - RelativePath=3D".\openvpnserv.c" > - > > - > - - RelativePath=3D".\service.c" > - > > - > - > - - Name=3D"Header Files" > - Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" > - UniqueIdentifier=3D"{93995380-89BD-4b04-88EB-625F= BE52EBFB}" > - > > - - RelativePath=3D".\service.h" > - > > - > - > - - Name=3D"Resource Files" > - Filter=3D"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;= jpg;jpeg;jpe;resx;tiff;tif;png;wav" > - UniqueIdentifier=3D"{67DA6AB6-F800-4c08-8B7A-83BB= 121AAD01}" > - > > - - RelativePath=3D".\openvpnserv_resources.r= c" > - > > - > - > - > - > - > - > diff --git a/src/openvpnserv/openvpnserv.vcxproj b/src/openvpnserv/openvp= nserv.vcxproj > new file mode 100644 > index 0000000..f2c0071 > --- /dev/null > +++ b/src/openvpnserv/openvpnserv.vcxproj > @@ -0,0 +1,112 @@ > +=EF=BB=BF > + > + > + > + Debug > + Win32 > + > + > + Release > + Win32 > + > + > + > + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD} > + openvpnserv > + Win32Proj > + > + > + > + Application > + MultiByte > + true > + > + > + Application > + MultiByte > + > + > + > + > + > + > + > + > + > + > + > + > + <_ProjectFileVersion>10.0.30319.1 > + $(SolutionDir)$(Platform)-Output\$(Configuration)\ > + $(Configuration)\ > + true > + $(SolutionDir)$(Platform)-Output\$(Configuration)\ > + $(Configuration)\ > + false > + > + > + > + Disabled > + $(SOURCEBASE);%(AdditionalIncludeDir= ectories) > + WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(Prepr= ocessorDefinitions) > + true > + EnableFastChecks > + MultiThreadedDebugDLL > + > + > + Level3 > + EditAndContinue > + > + > + $(SOURCEBASE);%(AdditionalIncludeDir= ectories) > + > + > + true > + Console > + MachineX86 > + > + > + > + > + MaxSpeed > + true > + $(SOURCEBASE);%(AdditionalIncludeDir= ectories) > + WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(Prepr= ocessorDefinitions) > + MultiThreadedDLL > + true > + > + > + Level3 > + ProgramDatabase > + > + > + $(SOURCEBASE);%(AdditionalIncludeDir= ectories) > + > + > + true > + Console > + true > + true > + MachineX86 > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + {8598c2c8-34c4-47a1-99b0-7c295a890615} > + false > + > + > + > + > + > + > \ No newline at end of file > diff --git a/src/openvpnserv/openvpnserv.vcxproj.filters b/src/openvpnser= v/openvpnserv.vcxproj.filters > new file mode 100644 > index 0000000..a6f8ecc > --- /dev/null > +++ b/src/openvpnserv/openvpnserv.vcxproj.filters > @@ -0,0 +1,35 @@ > +=EF=BB=BF > + > + > + > + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} > + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx > + > + > + {93995380-89BD-4b04-88EB-625FBE52EBFB} > + h;hpp;hxx;hm;inl;inc;xsd > + > + > + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} > + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;re= sx;tiff;tif;png;wav > + > + > + > + > + Source Files > + > + > + Source Files > + > + > + > + > + Header Files > + > + > + > + > + Resource Files > + > + > + > \ No newline at end of file > -- > 1.7.3.4 > > > -------------------------------------------------------------------------= ----- > This SF email is sponsosred by: > Try Windows Azure free for 90 days Click Here > http://p.sf.net/sfu/sfd2d-msazure > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel