diff options
Diffstat (limited to 'ports/winnt')
53 files changed, 3010 insertions, 10130 deletions
diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h index f56df9d0b574..e313272fd771 100644 --- a/ports/winnt/include/config.h +++ b/ports/winnt/include/config.h @@ -248,7 +248,6 @@ typedef int socklen_t; #define TYPEOF_IP_MULTICAST_LOOP BOOL #define SETSOCKOPT_ARG_CAST (const char *) #define HAVE_RANDOM -#define AUTOKEY #define SAVECONFIG 1 /* @@ -256,9 +255,12 @@ typedef int socklen_t; */ #define USE_MM_TIMER -/* Enable OpenSSL */ -#define OPENSSL 1 -#define USE_OPENSSL_CRYPTO_RAND 1 +/* check for OpenSSL */ +#ifdef OPENSSL +# define USE_OPENSSL_CRYPTO_RAND 1 +# define AUTOKEY +#endif +extern void arc4random_buf(void *buf, size_t nbytes); /* * Keywords and functions that Microsoft maps diff --git a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def index 14573a25c3d7..87531cf4e240 100644 --- a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def +++ b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def @@ -1,5 +1,7 @@ LIBRARY "loopback-ppsapi-provider.dll" - +; This is *needed* for x86 (32bit) builds, as it makes sure +; that the *undecorated* names are exported in the DLL. +; It *cannot* be used for the x64 (64bit) builds. EXPORTS ppsapi_prov_init prov_time_pps_create diff --git a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h index 5541e333ed3b..6e7ef1f8d5c0 100644 --- a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h +++ b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h @@ -6,7 +6,10 @@ // Within, in this case. // -#define _CRT_SECURE_NO_WARNINGS +#ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS +#endif + #include <stdio.h> #include <windows.h> typedef __int32 int32; diff --git a/ports/winnt/ppsapi/loopback/src/timepps.h b/ports/winnt/ppsapi/loopback/src/timepps.h index 3a7e80662418..c3042ef4737e 100644 --- a/ports/winnt/ppsapi/loopback/src/timepps.h +++ b/ports/winnt/ppsapi/loopback/src/timepps.h @@ -143,7 +143,6 @@ typedef unsigned long pps_seq_t; /* sequence number */ #pragma warning(push) -//#pragma warning(disable: 201) /* nonstd extension nameless union */ typedef struct ntp_fp { union { @@ -165,15 +164,16 @@ typedef union pps_timeu { /* timestamp format */ } pps_timeu_t; /* generic data type to represent time stamps */ /* addition of NTP fixed-point format */ +static void +ntpfp_add( /* *op1r += *op2 */ + ntp_fp_t *op1r, + const ntp_fp_t *op2 ) +{ + op1r->F.u += op2->F.u; + op1r->I.u += op2->I.u + (op1r->F.u < op2->F.u); +} -#define NTPFP_M_ADD(r_i, r_f, a_i, a_f) /* r += a */ \ - do { \ - r_f = (u_int32)(r_f) + (u_int32)(a_f); \ - r_i = (u_int32)(r_i) + (u_int32)(a_i) + \ - ((u_int32)(r_f) < (u_int32)(a_f)); \ - } while (0) - -#define NTPFP_L_ADDS(r, a) NTPFP_M_ADD((r)->I.u, (r)->F.u, (a)->I.u, (a)->F.u) +#define NTPFP_L_ADDS ntpfp_add /* @@ -369,12 +369,16 @@ unit_from_ppsapi_handle( * for any non-ntpd clients as they should rely only * the errno for PPSAPI functions. */ -#define RETURN_PPS_ERRNO(e) \ -do { \ - SetLastError(NO_ERROR); \ - errno = (e); \ - return -1; \ -} while (0) +static __inline int +pps_set_errno( + int e) +{ + SetLastError(NO_ERROR); + errno = e; + return -1; +} + +#define RETURN_PPS_ERRNO(e) return pps_set_errno(e) #ifdef OWN_PPS_NTP_TIMESTAMP_FROM_COUNTER @@ -404,6 +408,8 @@ pps_ntp_timestamp_from_counter( { ULONGLONG BiasedTimestamp; + (void)Counterstamp; + /* convert from 100ns units to NTP fixed point format */ BiasedTimestamp = Timestamp - PPS_FILETIME_1970; diff --git a/ports/winnt/vs2008/common.vsprops b/ports/winnt/vs2008/common.vsprops new file mode 100644 index 000000000000..53edd64ab217 --- /dev/null +++ b/ports/winnt/vs2008/common.vsprops @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="common" + OutputDirectory="$(OutBaseDir)" + IntermediateDirectory="$(TmpBaseDir)\$(TargetName)" + BuildLogFile="$(IntDir)\BuildLog.htm" + EnableManagedIncrementalBuild="0" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\lib\isc\include;..\..\..\..\sntp\libopts" + PreprocessorDefinitions="_CONSOLE;_WINDOWS;WIN32;SYS_WINNT;HAVE_CONFIG_H;HAVE_ARC4RANDOM_BUF;_CRT_SECURE_NO_WARNINGS" + StringPooling="true" + ExceptionHandling="0" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="false" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + XMLDocumentationFileName="$(IntDir)\" + BrowseInformation="1" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CompileAs="1" + DisableSpecificWarnings="4996" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + Version="4.2" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(TmpBaseDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + LinkTimeCodeGeneration="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="1" + /> + <UserMacro + Name="OutBaseDir" + Value="$(SolutionDir)\$(PlatformName)-out\$(ConfigurationName)" + /> + <UserMacro + Name="TmpBaseDir" + Value="$(SolutionDir)\$(PlatformName)-tmp\$(ConfigurationName)" + /> +</VisualStudioPropertySheet> diff --git a/ports/winnt/vs2008/debug-x64.vsprops b/ports/winnt/vs2008/debug-x64.vsprops new file mode 100644 index 000000000000..06f6f204e197 --- /dev/null +++ b/ports/winnt/vs2008/debug-x64.vsprops @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="debug-x64" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""$(OPENSSL64_INC)"" + PreprocessorDefinitions="_DEBUG;OPENSSL" + RuntimeLibrary="1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies=" $(OPENSSL64_LIB)\libeay32.lib" + TargetMachine="17" +/> +</VisualStudioPropertySheet> diff --git a/ports/winnt/vs2008/debug.vsprops b/ports/winnt/vs2008/debug.vsprops new file mode 100644 index 000000000000..0a1619748dbb --- /dev/null +++ b/ports/winnt/vs2008/debug.vsprops @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="debug-x86" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""$(OPENSSL_INC)"" + PreprocessorDefinitions="_DEBUG;OPENSSL" + RuntimeLibrary="1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies=" $(OPENSSL_LIB)\libeay32.lib" + TargetMachine="1" + /> +</VisualStudioPropertySheet> diff --git a/ports/winnt/vs2008/instsrv/instsrv.vcproj b/ports/winnt/vs2008/instsrv/instsrv.vcproj index e3324a66ec6b..335ad7f3d1bb 100644 --- a/ports/winnt/vs2008/instsrv/instsrv.vcproj +++ b/ports/winnt/vs2008/instsrv/instsrv.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="instsrv" ProjectGUID="{C3534C4D-6DF1-498E-9904-4337878A1515}" RootNamespace="instsrv" @@ -11,16 +11,85 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName="$(IntDir)Instsrv.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\instsrv" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -44,24 +113,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\..\..\include,..\..\include,..\..\instsrv" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)Instsrv.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)instsrv-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\instsrv" /> <Tool Name="VCManagedResourceCompilerTool" @@ -76,19 +129,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="oldnames.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -115,11 +156,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -138,28 +177,13 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" TypeLibraryName="$(IntDir)Instsrv.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\include,..\..\include,..\..\instsrv" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)Instsrv.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)instsrv-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\instsrv" /> <Tool Name="VCManagedResourceCompilerTool" @@ -174,18 +198,77 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="oldnames.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)Instsrv.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + WholeProgramOptimization="true" + AdditionalIncludeDirectories="..\..\instsrv" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -222,24 +305,10 @@ <File RelativePath="..\..\instsrv\instsrv.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> + </File> + <File + RelativePath=".\version.c" + > </File> </Filter> <Filter @@ -252,6 +321,50 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > </Filter> + <File + RelativePath="..\..\..\..\packageinfo.sh" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj index b87d1782d206..191cdfcf76f9 100644 --- a/ports/winnt/vs2008/libntp/libntp.vcproj +++ b/ports/winnt/vs2008/libntp/libntp.vcproj @@ -10,16 +10,18 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|Win32" + OutputDirectory="$(TmpBaseDir)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -42,31 +44,75 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)libntp.pch" - AssemblerListingLocation="$IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(IntDir)" - BrowseInformation="1" - WarningLevel="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(TmpBaseDir)" + ConfigurationType="4" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -95,11 +141,10 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Debug|Win32" + OutputDirectory="$(TmpBaseDir)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -122,33 +167,75 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H" - GeneratePreprocessedFile="0" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="false" - PrecompiledHeaderFile="$(IntDir)libntp.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(IntDir)" - BrowseInformation="1" - WarningLevel="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(TmpBaseDir)" + ConfigurationType="4" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -634,10 +721,6 @@ > </File> <File - RelativePath="..\..\..\..\include\global.h" - > - </File> - <File RelativePath="..\..\..\..\lib\isc\include\isc\hash.h" > </File> @@ -646,10 +729,6 @@ > </File> <File - RelativePath="..\..\include\netinet\in.h" - > - </File> - <File RelativePath="..\..\include\arpa\inet.h" > </File> @@ -686,7 +765,7 @@ > </File> <File - RelativePath="..\..\..\..\include\md5.h" + RelativePath="..\..\..\..\lib\isc\include\isc\md5.h" > </File> <File @@ -702,7 +781,7 @@ > </File> <File - RelativePath="..\..\..\..\include\isc\netaddr.h" + RelativePath="..\..\..\..\lib\isc\include\isc\netaddr.h" > </File> <File @@ -710,7 +789,7 @@ > </File> <File - RelativePath="..\..\..\..\include\isc\netscope.h" + RelativePath="..\..\..\..\lib\isc\include\isc\netscope.h" > </File> <File @@ -850,7 +929,7 @@ > </File> <File - RelativePath="..\..\include\sys\socket.h" + RelativePath="..\..\..\..\lib\isc\include\isc\socket.h" > </File> <File @@ -878,7 +957,7 @@ > </File> <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h" + RelativePath="..\..\include\sys\time.h" > </File> <File @@ -886,7 +965,7 @@ > </File> <File - RelativePath="..\..\include\sys\time.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h" > </File> <File @@ -910,7 +989,7 @@ > </File> <File - RelativePath="..\..\include\isc\win32os.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\win32os.h" > </File> </Filter> @@ -929,6 +1008,26 @@ RelativePath="..\..\libntp\messages.mc" > <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Message Compiler" + CommandLine="mc -h $(InputDir) -r $(InputDir) -e h $(InputPath)
" + Outputs="$(InputDir)$(InputName).rc;$(InputDir)$(InputName).h;$(InputDir)msg00001.bin" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Message Compiler" + CommandLine="mc -h $(InputDir) -r $(InputDir) -e h $(InputPath)
" + Outputs="$(InputDir)$(InputName).rc;$(InputDir)$(InputName).h;$(InputDir)msg00001.bin" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" > <Tool @@ -939,7 +1038,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" diff --git a/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj b/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj index e306108e6f9d..a2faa34668ff 100644 --- a/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj +++ b/ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj @@ -12,16 +12,19 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|Win32" ConfigurationType="2" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -40,22 +43,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include" - PreprocessorDefinitions="SYS_WINNT" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="serialpps-ppsapi-provider.h" - AssemblerListingLocation="$(IntDir)\" - ProgramDataBaseFileName="$(OutDir)loopback-ppsapi-provider-vc90" - BrowseInformation="1" - WarningLevel="3" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" /> <Tool Name="VCManagedResourceCompilerTool" @@ -69,16 +57,10 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="ntpd.lib" - OutputFile="$(OutDir)$(ProjectName).dll" - Version="0x0400" - LinkIncremental="1" + Version="4.2" AdditionalLibraryDirectories="$(OutDir)" - GenerateManifest="false" ModuleDefinitionFile="..\..\ppsapi\loopback\src\loopback-ppsapi.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="2" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -104,10 +86,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|x64" ConfigurationType="2" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -125,26 +106,75 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include" - PreprocessorDefinitions="SYS_WINNT" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="serialpps-ppsapi-provider.h" - AssemblerListingLocation="$(IntDir)\" - ProgramDataBaseFileName="$(OutDir)loopback-ppsapi-provider-vc90" - BrowseInformation="1" - WarningLevel="3" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ntpd.lib" + AdditionalLibraryDirectories="$(OutDir)" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" /> <Tool Name="VCManagedResourceCompilerTool" @@ -158,18 +188,74 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="ntpd.lib" - OutputFile="$(OutDir)$(ProjectName).dll" - Version="0x0400" - LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" - GenerateManifest="false" ModuleDefinitionFile="..\..\ppsapi\loopback\src\loopback-ppsapi.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ntpd.lib" + AdditionalLibraryDirectories="$(OutDir)" + SubSystem="2" /> <Tool Name="VCALinkTool" @@ -221,6 +307,10 @@ RelativePath="..\..\ppsapi\loopback\src\loopback-ppsapi.c" > </File> + <File + RelativePath=".\version.c" + > + </File> </Filter> <Filter Name="Header Files" @@ -247,8 +337,48 @@ > </Filter> <File - RelativePath=".\ReadMe.txt" + RelativePath="..\..\..\..\packageinfo.sh" > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P loopback-ppsapi
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P loopback-ppsapi
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P loopback-ppsapi
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P loopback-ppsapi
" + Outputs=".\version.c" + /> + </FileConfiguration> </File> </Files> <Globals> diff --git a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj index 6bf76fe93cf6..fd89859a6a46 100644 --- a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj +++ b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="ntp-keygen" ProjectGUID="{C88C1FBF-59D2-447F-BF57-0BCA8889028F}" RootNamespace="ntp-keygen" @@ -11,20 +11,85 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName="$(IntDir)ntp-keygen.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -45,25 +110,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - SmallerTypeCheck="true" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntp-keygen.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntp-keygen-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen" /> <Tool Name="VCManagedResourceCompilerTool" @@ -78,19 +125,73 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntp-keygen.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -117,15 +218,12 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -141,36 +239,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" TypeLibraryName="$(IntDir)ntp-keygen.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntp-keygen.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntp-keygen-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -178,19 +260,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -227,70 +297,14 @@ <File RelativePath="..\..\..\..\util\ntp-keygen-opts.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\..\util\ntp-keygen.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath=".\version.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> </Filter> <Filter @@ -311,21 +325,43 @@ RelativePath="..\..\..\..\packageinfo.sh" > <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntp-keygen
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntp-keygen
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> </File> diff --git a/ports/winnt/vs2008/ntp.sln b/ports/winnt/vs2008/ntp.sln index e5556d9043f4..5b6f1fa07c2f 100644 --- a/ports/winnt/vs2008/ntp.sln +++ b/ports/winnt/vs2008/ntp.sln @@ -31,7 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq\ntpq.vcproj", {400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpd-keyword-gen", "ntpd-keyword-gen\ntpd-keyword-gen.vcproj", "{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyword-gen", "ntpd-keyword-gen\ntpd-keyword-gen.vcproj", "{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}" ProjectSection(ProjectDependencies) = postProject {400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00} EndProjectSection @@ -44,45 +44,83 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|Win32.ActiveCfg = Debug|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|Win32.Build.0 = Debug|Win32 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|x64.ActiveCfg = Debug|x64 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|x64.Build.0 = Debug|x64 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|Win32.ActiveCfg = Release|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|Win32.Build.0 = Release|Win32 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|x64.ActiveCfg = Release|x64 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|x64.Build.0 = Release|x64 {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|Win32.ActiveCfg = Debug|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|Win32.Build.0 = Debug|Win32 + {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|x64.ActiveCfg = Debug|x64 + {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|x64.Build.0 = Debug|x64 {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|Win32.ActiveCfg = Release|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|Win32.Build.0 = Release|Win32 + {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|x64.ActiveCfg = Release|x64 + {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|x64.Build.0 = Release|x64 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|Win32.ActiveCfg = Debug|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|Win32.Build.0 = Debug|Win32 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|x64.ActiveCfg = Debug|x64 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|x64.Build.0 = Debug|x64 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|Win32.ActiveCfg = Release|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|Win32.Build.0 = Release|Win32 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|x64.ActiveCfg = Release|x64 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|x64.Build.0 = Release|x64 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|Win32.ActiveCfg = Debug|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|Win32.Build.0 = Debug|Win32 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|x64.ActiveCfg = Debug|x64 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|x64.Build.0 = Debug|x64 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|Win32.ActiveCfg = Release|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|Win32.Build.0 = Release|Win32 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|x64.ActiveCfg = Release|x64 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|x64.Build.0 = Release|x64 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|Win32.ActiveCfg = Debug|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|Win32.Build.0 = Debug|Win32 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|x64.ActiveCfg = Debug|x64 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|x64.Build.0 = Debug|x64 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|Win32.ActiveCfg = Release|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|Win32.Build.0 = Release|Win32 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|x64.ActiveCfg = Release|x64 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|x64.Build.0 = Release|x64 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|Win32.ActiveCfg = Debug|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|Win32.Build.0 = Debug|Win32 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|x64.ActiveCfg = Debug|x64 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|x64.Build.0 = Debug|x64 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|Win32.ActiveCfg = Release|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|Win32.Build.0 = Release|Win32 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|x64.ActiveCfg = Release|x64 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|x64.Build.0 = Release|x64 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|Win32.ActiveCfg = Debug|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|Win32.Build.0 = Debug|Win32 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|x64.ActiveCfg = Debug|x64 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|x64.Build.0 = Debug|x64 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|Win32.ActiveCfg = Release|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|Win32.Build.0 = Release|Win32 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|x64.ActiveCfg = Release|x64 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|x64.Build.0 = Release|x64 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|Win32.ActiveCfg = Debug|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|Win32.Build.0 = Debug|Win32 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|x64.ActiveCfg = Debug|x64 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|x64.Build.0 = Debug|x64 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|Win32.ActiveCfg = Release|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|Win32.Build.0 = Release|Win32 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|x64.ActiveCfg = Release|x64 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|x64.Build.0 = Release|x64 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|Win32.ActiveCfg = Debug|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|Win32.Build.0 = Debug|Win32 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|x64.ActiveCfg = Debug|x64 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|x64.Build.0 = Debug|x64 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|Win32.ActiveCfg = Release|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|Win32.Build.0 = Release|Win32 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|x64.ActiveCfg = Release|x64 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ports/winnt/vs2008/ntpd-keyword-gen/ntpd-keyword-gen.vcproj b/ports/winnt/vs2008/ntpd-keyword-gen/ntpd-keyword-gen.vcproj index 9a309d24ec84..9bd9e6f9d8d2 100644 --- a/ports/winnt/vs2008/ntpd-keyword-gen/ntpd-keyword-gen.vcproj +++ b/ports/winnt/vs2008/ntpd-keyword-gen/ntpd-keyword-gen.vcproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" - Name="ntpd-keyword-gen" + Version="9,00" + Name="keyword-gen" ProjectGUID="{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}" RootNamespace="ntpdkeywordgen" TargetFrameworkVersion="196613" @@ -11,15 +11,145 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration + Name="Release|Win32" + OutputDirectory="$(TmpBaseDir)" + ConfigurationType="1" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\keyword-gen.exe" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(TmpBaseDir)" + ConfigurationType="1" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\keyword-gen.exe" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + OutputDirectory="$(TmpBaseDir)" ConfigurationType="1" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" CharacterSet="2" > <Tool @@ -39,21 +169,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - SmallerTypeCheck="true" - RuntimeLibrary="1" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(OutDir)keyword-gen-vc90" - BrowseInformation="1" - WarningLevel="4" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" /> <Tool Name="VCManagedResourceCompilerTool" @@ -66,14 +182,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)keyword-gen.exe" - Version="0x0400" - LinkIncremental="1" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)keywordgen.pdb" - RandomizedBaseAddress="1" - TargetMachine="1" + OutputFile="$(OutDir)\keyword-gen.exe" + SubSystem="1" /> <Tool Name="VCALinkTool" @@ -99,12 +209,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Debug|x64" + OutputDirectory="$(TmpBaseDir)" ConfigurationType="1" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -120,22 +229,11 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts" - PreprocessorDefinitions="_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(OutDir)keyword-gen-vc90" - BrowseInformation="1" - WarningLevel="4" - DebugInformationFormat="3" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" /> <Tool Name="VCManagedResourceCompilerTool" @@ -148,15 +246,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)keyword-gen.exe" - Version="0x0400" - LinkIncremental="1" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)keywordgen.pdb" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" + OutputFile="$(OutDir)\keyword-gen.exe" + SubSystem="1" /> <Tool Name="VCALinkTool" diff --git a/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat b/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat index 3013b8f15c67..908b02b4d4eb 100644 --- a/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat +++ b/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat @@ -1,26 +1,40 @@ -@echo off +<@echo off REM gen-ntp_keyword.bat REM helper to invoke keyword-gen and possibly update ntp_keyword.h REM Usage: REM gen-ntp_keyword dir_containing_keyword-gen.exe REM -if "%1"=="" goto Usage -if not exist %1\keyword-gen.exe goto ExeNotFound -%1\keyword-gen.exe ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h + +set HDR_FILE=..\..\..\..\ntpd\ntp_keyword.h +set UTD_FILE=..\..\..\..\ntpd\keyword-gen-utd + +if "{%1}" == "{}" goto Usage +if not exist "%1\keyword-gen.exe" goto ExeNotFound +"%1\keyword-gen.exe" ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h + +REM check if we must create both files from scratch +if not exist "%HDR_FILE%" goto createFiles +if not exist "%UTD_FILE%" goto createFiles + findstr /v diff_ignore_line new_keyword.h > new_keyword_cmp.h -findstr /v diff_ignore_line ..\..\..\..\ntpd\ntp_keyword.h > ntp_keyword_cmp.h +findstr /v diff_ignore_line "%HDR_FILE%" > ntp_keyword_cmp.h set meat_changed=0 fc /L ntp_keyword_cmp.h new_keyword_cmp.h > NUL if errorlevel 1 set meat_changed=1 del ntp_keyword_cmp.h new_keyword_cmp.h if "0"=="%meat_changed%" goto SkipUpdate -xcopy /yf new_keyword.h ..\..\..\..\ntpd\ntp_keyword.h -findstr diff_ignore_line new_keyword.h > ..\..\..\..\ntpd\keyword-gen-utd + +:createFiles +copy /y /v new_keyword.h "%HDR_FILE%" > NUL +findstr diff_ignore_line new_keyword.h > "%UTD_FILE%" echo updated keyword-gen-utd and ntp_keyword.h goto SkipSkipMsg :skipUpdate echo ntp_keyword.h is unchanged +REM 'touch' the files by replacing them with a concatenation of itself and NUL: +copy /b "%HDR_FILE%" + NUL "%HDR_FILE%" > NUL +copy /b "%UTD_FILE%" + NUL "%UTD_FILE%" > NUL :SkipSkipMsg set meat_changed= diff --git a/ports/winnt/vs2008/ntpd/ntpd.vcproj b/ports/winnt/vs2008/ntpd/ntpd.vcproj index 3dfcfe4aa0f0..8f2fa3bc8b1d 100644 --- a/ports/winnt/vs2008/ntpd/ntpd.vcproj +++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj @@ -10,20 +10,20 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" WholeProgramOptimization="1" > <Tool @@ -45,27 +45,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="false" - PrecompiledHeaderFile="$(IntDir)ntpd.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpd-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" /> <Tool Name="VCManagedResourceCompilerTool" @@ -80,20 +60,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + AdditionalDependencies="winmm.lib" SubSystem="1" - OptimizeForWindows98="0" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="2" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -121,14 +89,11 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" WholeProgramOptimization="1" > <Tool @@ -150,29 +115,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - SmallerTypeCheck="true" - RuntimeLibrary="1" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpd.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpd-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" /> <Tool Name="VCManagedResourceCompilerTool" @@ -187,20 +130,150 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" + AdditionalDependencies="winmm.lib" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntpd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntpd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpd;..\..\..\..\ntpd" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" SubSystem="1" - OptimizeForWindows98="0" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="2" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -239,26 +312,6 @@ > </File> <File - RelativePath="..\..\..\..\ntpd\keyword-gen.c" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\..\ntpd\nt_clockstuff.c" > </File> @@ -303,26 +356,6 @@ > </File> <File - RelativePath="..\..\..\..\ntpd\ntp_parser.y" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\..\..\..\ntpd\ntp_peer.c" > </File> @@ -374,6 +407,10 @@ RelativePath="..\..\ntpd\ntservice.c" > </File> + <File + RelativePath=".\version.c" + > + </File> </Filter> <Filter Name="Header Files" @@ -416,15 +453,11 @@ > </File> <File - RelativePath="..\..\include\netinet\in.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h" > </File> <File - RelativePath="..\..\include\arpa\inet.h" - > - </File> - <File - RelativePath="..\..\include\isc\int.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\int.h" > </File> <File @@ -448,7 +481,7 @@ > </File> <File - RelativePath="..\..\..\libntp\log.h" + RelativePath="..\..\..\..\lib\isc\include\isc\log.h" > </File> <File @@ -456,10 +489,6 @@ > </File> <File - RelativePath="..\..\include\isc\net.h" - > - </File> - <File RelativePath="..\..\..\..\lib\isc\include\isc\netaddr.h" > </File> @@ -520,6 +549,10 @@ > </File> <File + RelativePath="..\..\..\..\ntpd\ntp_keyword.h" + > + </File> + <File RelativePath="..\..\..\..\ntpd\ntp_leapsec.h" > </File> @@ -546,6 +579,50 @@ <File RelativePath="..\..\..\..\ntpd\ntp_parser.h" > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" + CommandLine=".\gen-ntp_keyword $(TmpBaseDir)
" + AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" + Outputs="..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" + CommandLine=".\gen-ntp_keyword $(TmpBaseDir)
" + AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" + Outputs="..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" + CommandLine=".\gen-ntp_keyword $(TmpBaseDir)
" + AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" + Outputs="..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" + CommandLine=".\gen-ntp_keyword $(TmpBaseDir)
" + AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" + Outputs="..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd" + /> + </FileConfiguration> </File> <File RelativePath="..\..\..\..\include\ntp_proto.h" @@ -628,7 +705,7 @@ > </File> <File - RelativePath="..\..\include\isc\offset.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\offset.h" > </File> <File @@ -640,7 +717,7 @@ > </File> <File - RelativePath="..\..\include\isc\platform.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\platform.h" > </File> <File @@ -656,7 +733,7 @@ > </File> <File - RelativePath="..\..\include\sys\socket.h" + RelativePath="..\..\..\..\lib\isc\include\isc\socket.h" > </File> <File @@ -688,7 +765,7 @@ > </File> <File - RelativePath="..\..\include\isc\win32os.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\win32os.h" > </File> </Filter> @@ -698,85 +775,18 @@ <File RelativePath="..\..\libntp\messages.rc" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="..\libntp" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="..\libntp" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libntp\MSG00001.bin" > </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_keyword.h" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" - CommandLine=".\gen-ntp_keyword $(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)
" - AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" - Outputs="..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" - CommandLine=".\gen-ntp_keyword $(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)
" - AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" - Outputs="..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\version.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - ShowIncludes="true" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> </Filter> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > <File - RelativePath="..\libntp\messages.mc" + RelativePath="..\..\libntp\messages.mc" > </File> </Filter> @@ -1032,46 +1042,6 @@ > </File> <File - RelativePath="..\..\..\..\libparse\parsesolaris.c" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\libparse\parsestreams.c" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\..\..\..\libparse\trim_info.c" > </File> @@ -1095,6 +1065,22 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Release|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\..\..\packageinfo.sh" @@ -1104,9 +1090,10 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpd
" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h" - Outputs="$(ProjectDir)version.c" + Outputs=".\version.c" /> </FileConfiguration> <FileConfiguration @@ -1114,9 +1101,32 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpd
" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h" - Outputs="$(ProjectDir)version.c" + Outputs=".\version.c" /> </FileConfiguration> </File> diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj index 85a4bef373ca..791d78d7ea35 100644 --- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj +++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="ntpdate" ProjectGUID="{2789A62E-3F46-44F1-AAF0-816CD23C2911}" TargetFrameworkVersion="0" @@ -10,20 +10,20 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -44,24 +44,75 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC)" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntpdate.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdate-vc90" - BrowseInformation="1" - WarningLevel="4" + AdditionalIncludeDirectories="..\..\ntpdate;..\..\..\..\ntpdate" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName="$(IntDir)ntpdate.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpdate;..\..\..\..\ntpdate" /> <Tool Name="VCManagedResourceCompilerTool" @@ -76,19 +127,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -115,15 +154,12 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -139,30 +175,13 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" TypeLibraryName="$(IntDir)ntpdate.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC)" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpdate.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdate-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpdate;..\..\..\..\ntpdate" /> <Tool Name="VCManagedResourceCompilerTool" @@ -177,19 +196,76 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntpdate.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpdate;..\..\..\..\ntpdate" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -226,46 +302,10 @@ <File RelativePath="..\..\..\..\ntpdate\ntpdate.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath=".\version.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> </Filter> <Filter @@ -277,7 +317,7 @@ > </File> <File - RelativePath="..\..\include\isc\net.h" + RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h" > </File> <File @@ -338,21 +378,43 @@ RelativePath="..\..\..\..\packageinfo.sh" > <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdate
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdate
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> </File> diff --git a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj index 5fd301ddf8b5..ba1f8c5d11a6 100644 --- a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj +++ b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="ntpdc" ProjectGUID="{8011C820-B3D5-4034-86EA-FFC30AE6764B}" TargetFrameworkVersion="0" @@ -10,20 +10,20 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -44,24 +44,75 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntpdc.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdc-vc90" - BrowseInformation="1" - WarningLevel="4" + AdditionalIncludeDirectories="..\..\ntpdc;..\..\..\..\ntpdc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName="$(IntDir)ntpdc.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpdc;..\..\..\..\ntpdc" /> <Tool Name="VCManagedResourceCompilerTool" @@ -76,19 +127,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -115,15 +154,12 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" + Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -139,29 +175,13 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" TypeLibraryName="$(IntDir)ntpdc.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpdc.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdc-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpdc;..\..\..\..\ntpdc" /> <Tool Name="VCManagedResourceCompilerTool" @@ -176,19 +196,76 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntpdc.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpdc;..\..\..\..\ntpdc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -225,96 +302,18 @@ <File RelativePath="..\..\..\..\ntpdc\ntpdc-opts.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\..\ntpdc\ntpdc.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\..\ntpdc\ntpdc_ops.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> </File> <File RelativePath=".\version.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> </Filter> <Filter @@ -343,21 +342,43 @@ RelativePath="..\..\..\..\packageinfo.sh" > <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdc
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdc
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> </File> diff --git a/ports/winnt/vs2008/ntpq/ntpq.vcproj b/ports/winnt/vs2008/ntpq/ntpq.vcproj index 440b38bae97a..3d8c9a3c5ce3 100644 --- a/ports/winnt/vs2008/ntpq/ntpq.vcproj +++ b/ports/winnt/vs2008/ntpq/ntpq.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="ntpq" ProjectGUID="{6A92BF14-8931-48B1-A571-DEBE9F190616}" TargetFrameworkVersion="0" @@ -10,20 +10,20 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\release.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -44,24 +44,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpq.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpq-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpq;..\..\..\..\ntpq" /> <Tool Name="VCManagedResourceCompilerTool" @@ -76,19 +59,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -116,14 +87,11 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + InheritedPropertySheets="..\debug.vsprops;..\common.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > <Tool Name="VCPreBuildEventTool" @@ -144,24 +112,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntpq.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpq-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" + AdditionalIncludeDirectories="..\..\ntpq;..\..\..\..\ntpq" /> <Tool Name="VCManagedResourceCompilerTool" @@ -176,19 +127,145 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets="..\release-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntpq.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpq;..\..\..\..\ntpq" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" + OutputFile="$(IntDir)/$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets="..\debug-x64.vsprops;..\common.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName="$(IntDir)ntpq.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\ntpq;..\..\..\..\ntpq" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -225,90 +302,18 @@ <File RelativePath="..\..\..\..\ntpq\ntpq-opts.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\..\ntpq\ntpq-subs.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\..\ntpq\ntpq.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath=".\version.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> </Filter> <Filter @@ -337,8 +342,9 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpq
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> <FileConfiguration @@ -346,8 +352,29 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpq
" - Outputs="$(ProjectDir)version.c" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Using NT Shell Script to generate version.c" + CommandLine="..\..\scripts\mkver.bat -P $(ProjectName)
" + Outputs=".\version.c" /> </FileConfiguration> </File> diff --git a/ports/winnt/vs2008/release-x64.vsprops b/ports/winnt/vs2008/release-x64.vsprops new file mode 100644 index 000000000000..23cb8a8cbeb9 --- /dev/null +++ b/ports/winnt/vs2008/release-x64.vsprops @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="release-x64" + > + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + WholeProgramOptimization="true" + AdditionalIncludeDirectories=""$(OPENSSL64_INC)"" + PreprocessorDefinitions="NDEBUG;OPENSSL" + RuntimeLibrary="0" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies=" $(OPENSSL64_LIB)\libeay32.lib" + TargetMachine="17" + /> +</VisualStudioPropertySheet> diff --git a/ports/winnt/vs2008/release.vsprops b/ports/winnt/vs2008/release.vsprops new file mode 100644 index 000000000000..4c7c513ad713 --- /dev/null +++ b/ports/winnt/vs2008/release.vsprops @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="release-x86" + > + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + WholeProgramOptimization="true" + AdditionalIncludeDirectories=""$(OPENSSL_INC)"" + PreprocessorDefinitions="NDEBUG;OPENSSL" + RuntimeLibrary="0" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies=" $(OPENSSL_LIB)\libeay32.lib" + TargetMachine="1" + /> +</VisualStudioPropertySheet> diff --git a/ports/winnt/vs2013/common.props b/ports/winnt/vs2013/common.props new file mode 100644 index 000000000000..8b368d124432 --- /dev/null +++ b/ports/winnt/vs2013/common.props @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + </ImportGroup> + <PropertyGroup Label="UserMacros"> + <OutBaseDir>$(SolutionDir)\$(Platform)-out\$(Configuration)</OutBaseDir> + <TmpBaseDir>$(SolutionDir)\$(Platform)-tmp\$(Configuration)</TmpBaseDir> + </PropertyGroup> + <PropertyGroup> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> + <OutDir>$(OutBaseDir)\</OutDir> + <IntDir>$(TmpBaseDir)\$(TargetName)\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup> + <BuildLog> + <Path>$(IntDir)BuildLog.htm</Path> + </BuildLog> + <ClCompile> + <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\lib\isc\include;..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_CONSOLE;_WINDOWS;WIN32;SYS_WINNT;HAVE_CONFIG_H;HAVE_ARC4RANDOM_BUF;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <ExceptionHandling /> + <FunctionLevelLinking>true</FunctionLevelLinking> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> + <ObjectFileName>$(IntDir)</ObjectFileName> + <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName> + <BrowseInformation>true</BrowseInformation> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <WarningLevel>Level3</WarningLevel> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <Version>4.2</Version> + <SuppressStartupBanner>true</SuppressStartupBanner> + <AdditionalLibraryDirectories>$(TmpBaseDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention>false</DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <BuildMacro Include="OutBaseDir"> + <Value>$(OutBaseDir)</Value> + </BuildMacro> + <BuildMacro Include="TmpBaseDir"> + <Value>$(TmpBaseDir)</Value> + </BuildMacro> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/debug-x64.props b/ports/winnt/vs2013/debug-x64.props new file mode 100644 index 000000000000..938b6f21b2a4 --- /dev/null +++ b/ports/winnt/vs2013/debug-x64.props @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <Optimization>Disabled</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>$(OPENSSL64_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <AdditionalDependencies>$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup /> +</Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/debug.props b/ports/winnt/vs2013/debug.props new file mode 100644 index 000000000000..3808859088cf --- /dev/null +++ b/ports/winnt/vs2013/debug.props @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> + <_PropertySheetDisplayName>debug-x86</_PropertySheetDisplayName> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <Optimization>Disabled</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <AdditionalDependencies>$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup /> +</Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/instsrv/instsrv.vcproj b/ports/winnt/vs2013/instsrv/instsrv.vcproj deleted file mode 100644 index e3324a66ec6b..000000000000 --- a/ports/winnt/vs2013/instsrv/instsrv.vcproj +++ /dev/null @@ -1,258 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="instsrv" - ProjectGUID="{C3534C4D-6DF1-498E-9904-4337878A1515}" - RootNamespace="instsrv" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)Instsrv.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\..\..\include,..\..\include,..\..\instsrv" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)Instsrv.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)instsrv-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="oldnames.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)Instsrv.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\include,..\..\include,..\..\instsrv" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)Instsrv.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)instsrv-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="oldnames.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\instsrv\instsrv.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/instsrv/instsrv.vcxproj b/ports/winnt/vs2013/instsrv/instsrv.vcxproj index 69360a4f4508..e6af463ca8d7 100644 --- a/ports/winnt/vs2013/instsrv/instsrv.vcxproj +++ b/ports/winnt/vs2013/instsrv/instsrv.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -39,37 +31,25 @@ <RootNamespace>instsrv</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> @@ -81,464 +61,127 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Midl> - <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -547,124 +190,41 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)Instsrv.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)Instsrv.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)instsrv-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\instsrv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>oldnames.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -673,6 +233,35 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\instsrv\instsrv.c" /> + <ClCompile Include="version.c" /> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\packageinfo.sh"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> + </CustomBuild> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters b/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters index b2d70f6561b8..a002fdb88c3e 100644 --- a/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters +++ b/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters @@ -2,15 +2,15 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{e8390c50-c913-4569-99e0-d09ea4a59555}</UniqueIdentifier> + <UniqueIdentifier>{88b66c4c-94b1-4f5b-9746-4fe09cdfae66}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{bde2853f-cf7f-4658-89e7-21f3b87fc2e2}</UniqueIdentifier> + <UniqueIdentifier>{d9dc516d-d575-4027-8a48-b67dc1ba58c3}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{21cb96d9-ac72-4879-98fd-1e8ed146b4be}</UniqueIdentifier> + <UniqueIdentifier>{afc3883c-9da2-4632-8941-c77432dbd317}</UniqueIdentifier> <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> </Filter> </ItemGroup> @@ -18,5 +18,11 @@ <ClCompile Include="..\..\instsrv\instsrv.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="version.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\packageinfo.sh" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/libntp/libntp.vcproj b/ports/winnt/vs2013/libntp/libntp.vcproj deleted file mode 100644 index f9f57507d4d2..000000000000 --- a/ports/winnt/vs2013/libntp/libntp.vcproj +++ /dev/null @@ -1,936 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="libntp" - ProjectGUID="{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)libntp.pch" - AssemblerListingLocation="$IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(IntDir)" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H" - GeneratePreprocessedFile="0" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="false" - PrecompiledHeaderFile="$(IntDir)libntp.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(IntDir)" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\..\libntp\a_md5encrypt.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\adjtime.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\assertions.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\atoint.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\atolfp.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\atouint.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\audio.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\authkeys.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\authreadkeys.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\authusekey.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\backtrace-emptytbl.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\backtrace.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\buffer.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\buftvtots.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\caljulian.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\caltontp.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\calyearstart.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\clocktime.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\clocktypes.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\condition.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\decodenetnum.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\dofptoa.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\dolfptoa.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\emalloc.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\error.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\event.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\findconfig.c" - > - </File> - <File - RelativePath="..\..\libntp\getclock.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\getopt.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\hextoint.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\hextolfp.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\humandate.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\icom.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\inet_aton.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\inet_ntop.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\inet_pton.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\interfaceiter.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\iosignal.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\lib.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\lib_strbuf.c" - > - </File> - <File - RelativePath="..\..\..\..\sntp\libopts\libopts.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\log.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\machines.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\md5.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\mktime.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\modetoa.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\nls\msgcat.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\mstolfp.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\msyslog.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\net.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\netaddr.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\netof.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\netscope.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_calendar.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_intres.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_libopts.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_lineedit.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_random.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_rfc2553.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ntp_worker.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\numtoa.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\numtohost.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\octtoint.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\once.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\ondestroy.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\prettydate.c" - > - </File> - <File - RelativePath="..\..\libntp\randfile.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\recvbuff.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\refnumtoa.c" - > - </File> - <File - RelativePath="..\..\libntp\setpriority.c" - > - </File> - <File - RelativePath="..\..\libntp\SetSystemTime.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\snprintf.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\sockaddr.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\socket.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\socktoa.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\socktohost.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ssl_init.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\statestr.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\stdtime.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\strdup.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\strerror.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\strl_obsd.c" - > - </File> - <File - RelativePath="..\..\libntp\syslog.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\syssignal.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\systime.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\task.c" - > - </File> - <File - RelativePath="..\..\libntp\termios.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\thread.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\time.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\timetoa.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\timevalops.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\uglydate.c" - > - </File> - <File - RelativePath="..\..\libntp\util_clockstuff.c" - > - </File> - <File - RelativePath="..\..\libntp\win32_io.c" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\win32os.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\work_fork.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\work_thread.c" - > - </File> - <File - RelativePath="..\..\..\..\libntp\ymd2yd.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\..\..\sntp\libopts\ag-char-map.h" - > - </File> - <File - RelativePath="..\..\..\..\include\binio.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\buffer.h" - > - </File> - <File - RelativePath="..\..\include\clockstuff.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\condition.h" - > - </File> - <File - RelativePath="..\..\include\config.h" - > - </File> - <File - RelativePath="..\..\..\..\include\declcond.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\event.h" - > - </File> - <File - RelativePath="..\..\include\gaa_compat.h" - > - </File> - <File - RelativePath="..\..\..\..\include\global.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\hash.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ieee754io.h" - > - </File> - <File - RelativePath="..\..\include\netinet\in.h" - > - </File> - <File - RelativePath="..\..\include\arpa\inet.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\interfaceiter.h" - > - </File> - <File - RelativePath="..\..\..\..\include\intreswork.h" - > - </File> - <File - RelativePath="..\..\include\sys\ioctl.h" - > - </File> - <File - RelativePath="..\..\..\..\include\iosignal.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" - > - </File> - <File - RelativePath="..\..\..\..\include\l_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\..\include\lib_strbuf.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\log.h" - > - </File> - <File - RelativePath="..\..\..\..\include\md5.h" - > - </File> - <File - RelativePath="..\..\..\..\include\isc\mem.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\mutex.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h" - > - </File> - <File - RelativePath="..\..\..\..\include\isc\netaddr.h" - > - </File> - <File - RelativePath="..\..\include\netdb.h" - > - </File> - <File - RelativePath="..\..\..\..\include\isc\netscope.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_assert.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_calendar.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_control.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_debug.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_fp.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_if.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_intres.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_io.h" - > - </File> - <File - RelativePath="..\..\include\ntp_iocompletionport.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_libopts.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_lineedit.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_lists.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_machine.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_malloc.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_md5.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_net.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_proto.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_random.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_refclock.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_rfc2553.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_select.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_string.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_syslog.h" - > - </File> - <File - RelativePath="..\..\include\ntp_timer.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_types.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_unixtime.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntpd.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\ondestroy.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\platform.h" - > - </File> - <File - RelativePath="..\..\..\..\include\recvbuff.h" - > - </File> - <File - RelativePath="..\..\include\sys\resource.h" - > - </File> - <File - RelativePath="..\..\include\sys\signal.h" - > - </File> - <File - RelativePath="..\..\include\sys\socket.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\stat.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\stdtime.h" - > - </File> - <File - RelativePath="..\..\include\syslog.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\task.h" - > - </File> - <File - RelativePath="..\..\include\termios.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\thread.h" - > - </File> - <File - RelativePath="..\..\include\sys\time.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h" - > - </File> - <File - RelativePath="..\..\..\..\include\timespecops.h" - > - </File> - <File - RelativePath="..\..\..\..\include\timetoa.h" - > - </File> - <File - RelativePath="..\..\..\..\include\timevalops.h" - > - </File> - <File - RelativePath="..\..\include\win32_io.h" - > - </File> - <File - RelativePath="..\..\include\isc\win32os.h" - > - </File> - </Filter> - <Filter - Name="Generated Files" - > - <File - RelativePath="..\..\libntp\messages.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - > - <File - RelativePath="..\..\libntp\messages.mc" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Message Compiler" - CommandLine="mc -h $(InputDir) -r $(InputDir) -e h $(InputPath)
" - Outputs="$(InputDir)$(InputName).rc;$(InputDir)$(InputName).h;$(InputDir)msg00001.bin" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Message Compiler" - CommandLine="mc -h $(InputDir) -r $(InputDir) -e h $(InputPath)
" - Outputs="$(InputDir)$(InputName).rc;$(InputDir)$(InputName).h;$(InputDir)msg00001.bin" - /> - </FileConfiguration> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj index 1289c2d77dcf..fcf03b0137f6 100644 --- a/ports/winnt/vs2013/libntp/libntp.vcxproj +++ b/ports/winnt/vs2013/libntp/libntp.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -38,42 +30,28 @@ <ProjectGuid>{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> @@ -87,9 +65,9 @@ <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -97,188 +75,61 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Lib> - <SuppressStartupBanner>true</SuppressStartupBanner> - </Lib> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Lib> - <SuppressStartupBanner>true</SuppressStartupBanner> - </Lib> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> + <OutDir>$(TmpBaseDir)\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(TmpBaseDir)\</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Lib> @@ -289,38 +140,9 @@ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Lib> @@ -331,39 +153,10 @@ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessToFile>false</PreprocessToFile> - <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> @@ -376,42 +169,9 @@ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessToFile>false</PreprocessToFile> - <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Lib> @@ -422,42 +182,9 @@ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessToFile>false</PreprocessToFile> - <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Lib> @@ -468,42 +195,12 @@ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessToFile>false</PreprocessToFile> - <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)libntp.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>NoListing</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Lib> @@ -515,10 +212,7 @@ </Bscmake> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\libntp\a_md5encrypt.c" /> <ClCompile Include="..\..\..\..\libntp\adjtime.c" /> - <ClCompile Include="..\..\..\..\libntp\vint64ops.c" /> - <ClCompile Include="..\..\..\..\lib\isc\assertions.c" /> <ClCompile Include="..\..\..\..\libntp\atoint.c" /> <ClCompile Include="..\..\..\..\libntp\atolfp.c" /> <ClCompile Include="..\..\..\..\libntp\atouint.c" /> @@ -526,51 +220,31 @@ <ClCompile Include="..\..\..\..\libntp\authkeys.c" /> <ClCompile Include="..\..\..\..\libntp\authreadkeys.c" /> <ClCompile Include="..\..\..\..\libntp\authusekey.c" /> - <ClCompile Include="..\..\..\..\lib\isc\backtrace-emptytbl.c" /> - <ClCompile Include="..\..\..\..\lib\isc\backtrace.c" /> - <ClCompile Include="..\..\..\..\lib\isc\buffer.c" /> + <ClCompile Include="..\..\..\..\libntp\a_md5encrypt.c" /> <ClCompile Include="..\..\..\..\libntp\buftvtots.c" /> <ClCompile Include="..\..\..\..\libntp\caljulian.c" /> <ClCompile Include="..\..\..\..\libntp\caltontp.c" /> <ClCompile Include="..\..\..\..\libntp\calyearstart.c" /> <ClCompile Include="..\..\..\..\libntp\clocktime.c" /> <ClCompile Include="..\..\..\..\libntp\clocktypes.c" /> - <ClCompile Include="..\..\..\..\lib\isc\sha1.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\condition.c" /> <ClCompile Include="..\..\..\..\libntp\decodenetnum.c" /> <ClCompile Include="..\..\..\..\libntp\dofptoa.c" /> <ClCompile Include="..\..\..\..\libntp\dolfptoa.c" /> <ClCompile Include="..\..\..\..\libntp\emalloc.c" /> - <ClCompile Include="..\..\..\..\lib\isc\error.c" /> - <ClCompile Include="..\..\..\..\lib\isc\event.c" /> <ClCompile Include="..\..\..\..\libntp\findconfig.c" /> - <ClCompile Include="..\..\libntp\arc4wrap.c" /> - <ClCompile Include="..\..\libntp\getclock.c" /> <ClCompile Include="..\..\..\..\libntp\getopt.c" /> <ClCompile Include="..\..\..\..\libntp\hextoint.c" /> <ClCompile Include="..\..\..\..\libntp\hextolfp.c" /> <ClCompile Include="..\..\..\..\libntp\humandate.c" /> <ClCompile Include="..\..\..\..\libntp\icom.c" /> - <ClCompile Include="..\..\..\..\lib\isc\inet_aton.c" /> - <ClCompile Include="..\..\..\..\lib\isc\inet_ntop.c" /> - <ClCompile Include="..\..\..\..\lib\isc\inet_pton.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\interfaceiter.c" /> <ClCompile Include="..\..\..\..\libntp\iosignal.c" /> - <ClCompile Include="..\..\..\..\lib\isc\lib.c" /> <ClCompile Include="..\..\..\..\libntp\lib_strbuf.c" /> - <ClCompile Include="..\..\..\..\sntp\libopts\libopts.c" /> - <ClCompile Include="..\..\..\..\lib\isc\log.c" /> <ClCompile Include="..\..\..\..\libntp\machines.c" /> - <ClCompile Include="..\..\..\..\lib\isc\md5.c" /> <ClCompile Include="..\..\..\..\libntp\mktime.c" /> <ClCompile Include="..\..\..\..\libntp\modetoa.c" /> - <ClCompile Include="..\..\..\..\lib\isc\nls\msgcat.c" /> <ClCompile Include="..\..\..\..\libntp\mstolfp.c" /> <ClCompile Include="..\..\..\..\libntp\msyslog.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\net.c" /> - <ClCompile Include="..\..\..\..\lib\isc\netaddr.c" /> <ClCompile Include="..\..\..\..\libntp\netof.c" /> - <ClCompile Include="..\..\..\..\lib\isc\netscope.c" /> <ClCompile Include="..\..\..\..\libntp\ntp_calendar.c" /> <ClCompile Include="..\..\..\..\libntp\ntp_crypto_rnd.c" /> <ClCompile Include="..\..\..\..\libntp\ntp_intres.c" /> @@ -582,75 +256,76 @@ <ClCompile Include="..\..\..\..\libntp\numtoa.c" /> <ClCompile Include="..\..\..\..\libntp\numtohost.c" /> <ClCompile Include="..\..\..\..\libntp\octtoint.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\once.c" /> - <ClCompile Include="..\..\..\..\lib\isc\ondestroy.c" /> <ClCompile Include="..\..\..\..\libntp\prettydate.c" /> - <ClCompile Include="..\..\libntp\randfile.c" /> <ClCompile Include="..\..\..\..\libntp\recvbuff.c" /> <ClCompile Include="..\..\..\..\libntp\refnumtoa.c" /> - <ClCompile Include="..\..\libntp\setpriority.c" /> - <ClCompile Include="..\..\libntp\SetSystemTime.c" /> <ClCompile Include="..\..\..\..\libntp\snprintf.c" /> - <ClCompile Include="..\..\..\..\lib\isc\sockaddr.c" /> <ClCompile Include="..\..\..\..\libntp\socket.c" /> <ClCompile Include="..\..\..\..\libntp\socktoa.c" /> <ClCompile Include="..\..\..\..\libntp\socktohost.c" /> <ClCompile Include="..\..\..\..\libntp\ssl_init.c" /> <ClCompile Include="..\..\..\..\libntp\statestr.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\stdtime.c" /> <ClCompile Include="..\..\..\..\libntp\strdup.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\strerror.c" /> <ClCompile Include="..\..\..\..\libntp\strl_obsd.c" /> - <ClCompile Include="..\..\libntp\syslog.c" /> <ClCompile Include="..\..\..\..\libntp\syssignal.c" /> <ClCompile Include="..\..\..\..\libntp\systime.c" /> - <ClCompile Include="..\..\..\..\lib\isc\task.c" /> - <ClCompile Include="..\..\libntp\termios.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\thread.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\time.c" /> <ClCompile Include="..\..\..\..\libntp\timetoa.c" /> <ClCompile Include="..\..\..\..\libntp\timevalops.c" /> <ClCompile Include="..\..\..\..\libntp\uglydate.c" /> - <ClCompile Include="..\..\libntp\util_clockstuff.c" /> - <ClCompile Include="..\..\libntp\win32_io.c" /> - <ClCompile Include="..\..\..\..\lib\isc\win32\win32os.c" /> + <ClCompile Include="..\..\..\..\libntp\vint64ops.c" /> <ClCompile Include="..\..\..\..\libntp\work_fork.c" /> <ClCompile Include="..\..\..\..\libntp\work_thread.c" /> <ClCompile Include="..\..\..\..\libntp\ymd2yd.c" /> + <ClCompile Include="..\..\..\..\lib\isc\assertions.c" /> + <ClCompile Include="..\..\..\..\lib\isc\backtrace-emptytbl.c" /> + <ClCompile Include="..\..\..\..\lib\isc\backtrace.c" /> + <ClCompile Include="..\..\..\..\lib\isc\buffer.c" /> + <ClCompile Include="..\..\..\..\lib\isc\error.c" /> + <ClCompile Include="..\..\..\..\lib\isc\event.c" /> + <ClCompile Include="..\..\..\..\lib\isc\inet_aton.c" /> + <ClCompile Include="..\..\..\..\lib\isc\inet_ntop.c" /> + <ClCompile Include="..\..\..\..\lib\isc\inet_pton.c" /> + <ClCompile Include="..\..\..\..\lib\isc\lib.c" /> + <ClCompile Include="..\..\..\..\lib\isc\log.c" /> + <ClCompile Include="..\..\..\..\lib\isc\md5.c" /> + <ClCompile Include="..\..\..\..\lib\isc\netaddr.c" /> + <ClCompile Include="..\..\..\..\lib\isc\netscope.c" /> + <ClCompile Include="..\..\..\..\lib\isc\nls\msgcat.c" /> + <ClCompile Include="..\..\..\..\lib\isc\ondestroy.c" /> + <ClCompile Include="..\..\..\..\lib\isc\sha1.c" /> + <ClCompile Include="..\..\..\..\lib\isc\sockaddr.c" /> + <ClCompile Include="..\..\..\..\lib\isc\task.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\condition.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\interfaceiter.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\net.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\once.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\stdtime.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\strerror.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\thread.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\time.c" /> + <ClCompile Include="..\..\..\..\lib\isc\win32\win32os.c" /> + <ClCompile Include="..\..\..\..\sntp\libopts\libopts.c" /> + <ClCompile Include="..\..\libntp\arc4wrap.c" /> + <ClCompile Include="..\..\libntp\getclock.c" /> + <ClCompile Include="..\..\libntp\randfile.c" /> + <ClCompile Include="..\..\libntp\setpriority.c" /> + <ClCompile Include="..\..\libntp\SetSystemTime.c" /> + <ClCompile Include="..\..\libntp\syslog.c" /> + <ClCompile Include="..\..\libntp\termios.c" /> + <ClCompile Include="..\..\libntp\util_clockstuff.c" /> + <ClCompile Include="..\..\libntp\win32_io.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\..\include\vint64ops.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\sha1.h" /> - <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h" /> <ClInclude Include="..\..\..\..\include\binio.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\buffer.h" /> - <ClInclude Include="..\..\include\clockstuff.h" /> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\condition.h" /> - <ClInclude Include="..\..\include\config.h" /> <ClInclude Include="..\..\..\..\include\declcond.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\event.h" /> - <ClInclude Include="..\..\include\gaa_compat.h" /> - <ClInclude Include="..\..\..\..\include\global.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\hash.h" /> <ClInclude Include="..\..\..\..\include\ieee754io.h" /> - <ClInclude Include="..\..\include\netinet\in.h" /> - <ClInclude Include="..\..\include\arpa\inet.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h" /> <ClInclude Include="..\..\..\..\include\intreswork.h" /> - <ClInclude Include="..\..\include\sys\ioctl.h" /> <ClInclude Include="..\..\..\..\include\iosignal.h" /> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" /> - <ClInclude Include="..\..\..\..\include\l_stdlib.h" /> - <ClInclude Include="..\..\..\..\include\lib_strbuf.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h" /> - <ClInclude Include="..\..\..\..\include\md5.h" /> <ClInclude Include="..\..\..\..\include\isc\mem.h" /> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\mutex.h" /> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" /> - <ClInclude Include="..\..\..\..\include\isc\netaddr.h" /> - <ClInclude Include="..\..\include\netdb.h" /> - <ClInclude Include="..\..\..\..\include\isc\netscope.h" /> + <ClInclude Include="..\..\..\..\include\lib_strbuf.h" /> + <ClInclude Include="..\..\..\..\include\l_stdlib.h" /> <ClInclude Include="..\..\..\..\include\ntp.h" /> + <ClInclude Include="..\..\..\..\include\ntpd.h" /> <ClInclude Include="..\..\..\..\include\ntp_assert.h" /> <ClInclude Include="..\..\..\..\include\ntp_calendar.h" /> <ClInclude Include="..\..\..\..\include\ntp_control.h" /> @@ -659,7 +334,6 @@ <ClInclude Include="..\..\..\..\include\ntp_if.h" /> <ClInclude Include="..\..\..\..\include\ntp_intres.h" /> <ClInclude Include="..\..\..\..\include\ntp_io.h" /> - <ClInclude Include="..\..\include\ntp_iocompletionport.h" /> <ClInclude Include="..\..\..\..\include\ntp_libopts.h" /> <ClInclude Include="..\..\..\..\include\ntp_lineedit.h" /> <ClInclude Include="..\..\..\..\include\ntp_lists.h" /> @@ -675,65 +349,77 @@ <ClInclude Include="..\..\..\..\include\ntp_stdlib.h" /> <ClInclude Include="..\..\..\..\include\ntp_string.h" /> <ClInclude Include="..\..\..\..\include\ntp_syslog.h" /> - <ClInclude Include="..\..\include\ntp_timer.h" /> <ClInclude Include="..\..\..\..\include\ntp_types.h" /> <ClInclude Include="..\..\..\..\include\ntp_unixtime.h" /> - <ClInclude Include="..\..\..\..\include\ntpd.h" /> + <ClInclude Include="..\..\..\..\include\recvbuff.h" /> + <ClInclude Include="..\..\..\..\include\timespecops.h" /> + <ClInclude Include="..\..\..\..\include\timetoa.h" /> + <ClInclude Include="..\..\..\..\include\timevalops.h" /> + <ClInclude Include="..\..\..\..\include\vint64ops.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\buffer.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\event.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\hash.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\md5.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\netscope.h" /> <ClInclude Include="..\..\..\..\lib\isc\include\isc\ondestroy.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\task.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\condition.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\mutex.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" /> <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h" /> - <ClInclude Include="..\..\..\..\include\recvbuff.h" /> - <ClInclude Include="..\..\include\sys\resource.h" /> - <ClInclude Include="..\..\include\sys\signal.h" /> - <ClInclude Include="..\..\include\sys\socket.h" /> <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stat.h" /> <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stdtime.h" /> - <ClInclude Include="..\..\include\syslog.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\task.h" /> - <ClInclude Include="..\..\include\termios.h" /> <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\thread.h" /> - <ClInclude Include="..\..\include\sys\time.h" /> <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\time.h" /> - <ClInclude Include="..\..\..\..\include\timespecops.h" /> - <ClInclude Include="..\..\..\..\include\timetoa.h" /> - <ClInclude Include="..\..\..\..\include\timevalops.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h" /> + <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h" /> + <ClInclude Include="..\..\include\arpa\inet.h" /> + <ClInclude Include="..\..\include\clockstuff.h" /> + <ClInclude Include="..\..\include\config.h" /> + <ClInclude Include="..\..\include\gaa_compat.h" /> + <ClInclude Include="..\..\include\netdb.h" /> + <ClInclude Include="..\..\include\ntp_iocompletionport.h" /> + <ClInclude Include="..\..\include\ntp_timer.h" /> + <ClInclude Include="..\..\include\syslog.h" /> + <ClInclude Include="..\..\include\sys\ioctl.h" /> + <ClInclude Include="..\..\include\sys\resource.h" /> + <ClInclude Include="..\..\include\sys\signal.h" /> + <ClInclude Include="..\..\include\sys\time.h" /> + <ClInclude Include="..\..\include\termios.h" /> <ClInclude Include="..\..\include\win32_io.h" /> - <ClInclude Include="..\..\include\isc\win32os.h" /> <ClInclude Include="..\..\libntp\messages.h" /> </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\libntp\messages.mc"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Message Compiler</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">Message Compiler</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Message Compiler</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">Message Compiler</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Message Compiler</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) </Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Message Compiler</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) -</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Message Compiler</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">Message Compiler</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Message Compiler</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">Message Compiler</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Message Compiler</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) </Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Message Compiler</Message> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) -</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">%(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters index 10596c6863af..36fe23d899b2 100644 --- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters +++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters @@ -2,18 +2,18 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{df2922e3-313f-4661-9019-a88cb5be1bee}</UniqueIdentifier> + <UniqueIdentifier>{9b4d7229-201b-44b0-8b6d-c58920cf47a4}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{70e10793-da6a-4bfe-b35a-c00a64ac61bc}</UniqueIdentifier> + <UniqueIdentifier>{c2a2356e-0e9e-4804-a4b1-d60449f2911e}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Generated Files"> - <UniqueIdentifier>{6452d330-e63a-473c-bd9f-1874d4061592}</UniqueIdentifier> + <UniqueIdentifier>{279a0045-e0b3-43ce-b511-e6f2e0f43a80}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{fc799aa8-add1-4e83-8dff-de647477bf79}</UniqueIdentifier> + <UniqueIdentifier>{723fb507-c0d4-4c49-bb1e-644e479d13d2}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -23,6 +23,9 @@ <ClCompile Include="..\..\..\..\libntp\adjtime.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\libntp\arc4wrap.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\..\lib\isc\assertions.c"> <Filter>Source Files</Filter> </ClCompile> @@ -179,6 +182,9 @@ <ClCompile Include="..\..\..\..\libntp\ntp_calendar.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\libntp\ntp_crypto_rnd.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\..\libntp\ntp_intres.c"> <Filter>Source Files</Filter> </ClCompile> @@ -230,6 +236,9 @@ <ClCompile Include="..\..\libntp\SetSystemTime.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\lib\isc\sha1.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\..\libntp\snprintf.c"> <Filter>Source Files</Filter> </ClCompile> @@ -296,6 +305,9 @@ <ClCompile Include="..\..\libntp\util_clockstuff.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\libntp\vint64ops.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\libntp\win32_io.c"> <Filter>Source Files</Filter> </ClCompile> @@ -311,18 +323,6 @@ <ClCompile Include="..\..\..\..\libntp\ymd2yd.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\lib\isc\sha1.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\libntp\vint64ops.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\libntp\ntp_crypto_rnd.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\libntp\arc4wrap.c"> - <Filter>Source Files</Filter> - </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h"> @@ -352,18 +352,12 @@ <ClInclude Include="..\..\include\gaa_compat.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\global.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\lib\isc\include\isc\hash.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\..\..\..\include\ieee754io.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\netinet\in.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\include\arpa\inet.h"> <Filter>Header Files</Filter> </ClInclude> @@ -391,9 +385,6 @@ <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\md5.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\isc\mem.h"> <Filter>Header Files</Filter> </ClInclude> @@ -403,15 +394,9 @@ <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\isc\netaddr.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\include\netdb.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\isc\netscope.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\ntp.h"> <Filter>Header Files</Filter> </ClInclude> @@ -514,9 +499,6 @@ <ClInclude Include="..\..\include\sys\signal.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\sys\socket.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stat.h"> <Filter>Header Files</Filter> </ClInclude> @@ -535,10 +517,10 @@ <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\thread.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\sys\time.h"> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\time.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\time.h"> + <ClInclude Include="..\..\include\sys\time.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\..\..\..\include\timespecops.h"> @@ -550,19 +532,28 @@ <ClInclude Include="..\..\..\..\include\timevalops.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\win32_io.h"> + <ClInclude Include="..\..\..\..\include\vint64ops.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\win32os.h"> + <ClInclude Include="..\..\include\win32_io.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\..\libntp\messages.h"> <Filter>Generated Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\sha1.h"> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\md5.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\vint64ops.h"> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\netscope.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> diff --git a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcproj b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcproj deleted file mode 100644 index e306108e6f9d..000000000000 --- a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcproj +++ /dev/null @@ -1,256 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="loopback-ppsapi-provider" - ProjectGUID="{1ACE209D-D56E-450B-8711-B73E4ACFC38E}" - RootNamespace="loopbackerialppsapiprovider" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include" - PreprocessorDefinitions="SYS_WINNT" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="serialpps-ppsapi-provider.h" - AssemblerListingLocation="$(IntDir)\" - ProgramDataBaseFileName="$(OutDir)loopback-ppsapi-provider-vc90" - BrowseInformation="1" - WarningLevel="3" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ntpd.lib" - OutputFile="$(OutDir)$(ProjectName).dll" - Version="0x0400" - LinkIncremental="1" - AdditionalLibraryDirectories="$(OutDir)" - GenerateManifest="false" - ModuleDefinitionFile="..\..\ppsapi\loopback\src\loopback-ppsapi.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="2" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include" - PreprocessorDefinitions="SYS_WINNT" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="serialpps-ppsapi-provider.h" - AssemblerListingLocation="$(IntDir)\" - ProgramDataBaseFileName="$(OutDir)loopback-ppsapi-provider-vc90" - BrowseInformation="1" - WarningLevel="3" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ntpd.lib" - OutputFile="$(OutDir)$(ProjectName).dll" - Version="0x0400" - LinkIncremental="1" - AdditionalLibraryDirectories="$(OutDir)" - GenerateManifest="false" - ModuleDefinitionFile="..\..\ppsapi\loopback\src\loopback-ppsapi.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - <ProjectReference - ReferencedProjectIdentifier="{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}" - CopyLocal="false" - CopyLocalDependencies="false" - CopyLocalSatelliteAssemblies="false" - RelativePathToProject=".\libntp\libntp.vcproj" - /> - <ProjectReference - ReferencedProjectIdentifier="{CB61F8BF-9637-495C-9087-E8664B400CE0}" - CopyLocal="false" - CopyLocalDependencies="false" - CopyLocalSatelliteAssemblies="false" - RelativePathToProject=".\ntpd\ntpd.vcproj" - /> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\ppsapi\loopback\src\loopback-ppsapi.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\ppsapi\loopback\src\loopback-ppsapi.h" - > - </File> - <File - RelativePath="..\..\ppsapi\loopback\src\sys\time.h" - > - </File> - <File - RelativePath="..\..\ppsapi\loopback\src\timepps.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - <File - RelativePath=".\ReadMe.txt" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj index a5ba8aa9ced3..a0bcdce1cbc2 100644 --- a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj +++ b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -40,513 +32,164 @@ <Keyword>Win32Proj</Keyword> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> + <Version>4.2</Version> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> + <Version>4.2</Version> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - </Link> - <Bscmake> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <Link> - <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> - <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <Link> - <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> - <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SYS_WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PrecompiledHeaderFile>serialpps-ppsapi-provider.h</PrecompiledHeaderFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ProgramDataBaseFileName>$(OutDir)loopback-ppsapi-provider-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ntpd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> - <Version> - </Version> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>..\..\ppsapi\loopback\src\loopback-ppsapi.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> @@ -568,6 +211,7 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\ppsapi\loopback\src\loopback-ppsapi.c" /> + <ClCompile Include="version.c" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\ppsapi\loopback\src\loopback-ppsapi.h" /> @@ -575,7 +219,32 @@ <ClInclude Include="..\..\ppsapi\loopback\src\timepps.h" /> </ItemGroup> <ItemGroup> - <Text Include="ReadMe.txt" /> + <CustomBuild Include="..\..\..\..\packageinfo.sh"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P loopback-ppsapi +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P loopback-ppsapi +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P loopback-ppsapi +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P loopback-ppsapi +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P loopback-ppsapi +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P loopback-ppsapi +</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> + </CustomBuild> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj.filters b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj.filters index 135f4eb7e004..2b720fa95ba8 100644 --- a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj.filters +++ b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj.filters @@ -18,6 +18,9 @@ <ClCompile Include="..\..\ppsapi\loopback\src\loopback-ppsapi.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="version.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\ppsapi\loopback\src\loopback-ppsapi.h"> @@ -31,6 +34,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <Text Include="ReadMe.txt" /> + <CustomBuild Include="..\..\..\..\packageinfo.sh" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcproj deleted file mode 100644 index 6bf76fe93cf6..000000000000 --- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcproj +++ /dev/null @@ -1,335 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="ntp-keygen" - ProjectGUID="{C88C1FBF-59D2-447F-BF57-0BCA8889028F}" - RootNamespace="ntp-keygen" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntp-keygen.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - SmallerTypeCheck="true" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntp-keygen.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntp-keygen-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntp-keygen.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntp-keygen.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntp-keygen-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\..\util\ntp-keygen-opts.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\util\ntp-keygen.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\version.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\include\config.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - <File - RelativePath="..\..\..\..\packageinfo.sh" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntp-keygen
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntp-keygen
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj index 21a2675c34a2..be141be36188 100644 --- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj +++ b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -39,41 +31,25 @@ <RootNamespace>ntp-keygen</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> @@ -81,478 +57,123 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> - <HeaderFileName /> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -561,126 +182,40 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntp-keygen.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntp-keygen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -688,16 +223,7 @@ </Bscmake> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\util\ntp-keygen-opts.c"> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">Level3</WarningLevel> - </ClCompile> + <ClCompile Include="..\..\..\..\util\ntp-keygen-opts.c" /> <ClCompile Include="..\..\..\..\util\ntp-keygen.c" /> <ClCompile Include="version.c" /> </ItemGroup> @@ -706,38 +232,30 @@ </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\..\packageinfo.sh"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters index 4fba55170c74..b833f2394e26 100644 --- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters +++ b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters @@ -2,15 +2,15 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{f11f7756-c1fa-4353-8941-89cc81be5e02}</UniqueIdentifier> + <UniqueIdentifier>{5e68f697-629e-4dbe-be3f-5ad6c0ea94ec}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{e01d2f25-84af-473d-bb5a-57991927813b}</UniqueIdentifier> + <UniqueIdentifier>{d6b533d8-5922-4260-b313-6e47b12171e5}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{8fcd5bab-1f17-4bd9-93a5-33c7eac5b745}</UniqueIdentifier> + <UniqueIdentifier>{69c2d8e9-6b31-40b6-bdc8-69e5d5b5d8fd}</UniqueIdentifier> <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> </Filter> </ItemGroup> diff --git a/ports/winnt/vs2013/ntp.sln b/ports/winnt/vs2013/ntp.sln index e28828f370a4..c81fe95a3fb9 100644 --- a/ports/winnt/vs2013/ntp.sln +++ b/ports/winnt/vs2013/ntp.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30219.0 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpd", "ntpd\ntpd.vcxproj", "{CB61F8BF-9637-495C-9087-E8664B400CE0}" EndProject @@ -17,148 +17,148 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntp-keygen", "ntp-keygen\nt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq\ntpq.vcxproj", "{6A92BF14-8931-48B1-A571-DEBE9F190616}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpd-keyword-gen", "ntpd-keyword-gen\ntpd-keyword-gen.vcxproj", "{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyword-gen", "ntpd-keyword-gen\ntpd-keyword-gen.vcxproj", "{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loopback-ppsapi-provider", "loopback-pps\loopback-ppsapi-provider.vcxproj", "{1ACE209D-D56E-450B-8711-B73E4ACFC38E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug XP|Win32 = Debug XP|Win32 - Debug XP|x64 = Debug XP|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release XP|Win32 = Release XP|Win32 - Release XP|x64 = Release XP|x64 + DebugXP|Win32 = DebugXP|Win32 + DebugXP|x64 = DebugXP|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 + ReleaseXP|Win32 = ReleaseXP|Win32 + ReleaseXP|x64 = ReleaseXP|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug XP|x64.ActiveCfg = Debug XP|x64 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|Win32.ActiveCfg = Debug|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|Win32.Build.0 = Debug|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|x64.ActiveCfg = Debug|x64 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|x64.Build.0 = Debug|x64 - {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release XP|Win32.Build.0 = Release XP|Win32 - {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release XP|x64.ActiveCfg = Release XP|x64 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|Win32.ActiveCfg = Release|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|Win32.Build.0 = Release|Win32 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|x64.ActiveCfg = Release|x64 {CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|x64.Build.0 = Release|x64 - {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {CB61F8BF-9637-495C-9087-E8664B400CE0}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|Win32.ActiveCfg = Debug|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|Win32.Build.0 = Debug|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|x64.ActiveCfg = Debug|x64 {C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|x64.Build.0 = Debug|x64 - {C3534C4D-6DF1-498E-9904-4337878A1515}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {C3534C4D-6DF1-498E-9904-4337878A1515}.Release XP|Win32.Build.0 = Release XP|Win32 - {C3534C4D-6DF1-498E-9904-4337878A1515}.Release XP|x64.ActiveCfg = Release XP|x64 + {C3534C4D-6DF1-498E-9904-4337878A1515}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {C3534C4D-6DF1-498E-9904-4337878A1515}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {C3534C4D-6DF1-498E-9904-4337878A1515}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|Win32.ActiveCfg = Release|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|Win32.Build.0 = Release|Win32 {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|x64.ActiveCfg = Release|x64 {C3534C4D-6DF1-498E-9904-4337878A1515}.Release|x64.Build.0 = Release|x64 - {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {C3534C4D-6DF1-498E-9904-4337878A1515}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {C3534C4D-6DF1-498E-9904-4337878A1515}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {C3534C4D-6DF1-498E-9904-4337878A1515}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|Win32.ActiveCfg = Debug|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|Win32.Build.0 = Debug|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|x64.ActiveCfg = Debug|x64 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|x64.Build.0 = Debug|x64 - {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release XP|Win32.Build.0 = Release XP|Win32 - {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release XP|x64.ActiveCfg = Release XP|x64 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|Win32.ActiveCfg = Release|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|Win32.Build.0 = Release|Win32 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|x64.ActiveCfg = Release|x64 {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|x64.Build.0 = Release|x64 - {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|Win32.ActiveCfg = Debug|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|Win32.Build.0 = Debug|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|x64.ActiveCfg = Debug|x64 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|x64.Build.0 = Debug|x64 - {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release XP|Win32.Build.0 = Release XP|Win32 - {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release XP|x64.ActiveCfg = Release XP|x64 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|Win32.ActiveCfg = Release|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|Win32.Build.0 = Release|Win32 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|x64.ActiveCfg = Release|x64 {2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|x64.Build.0 = Release|x64 - {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {2789A62E-3F46-44F1-AAF0-816CD23C2911}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|Win32.ActiveCfg = Debug|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|Win32.Build.0 = Debug|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|x64.ActiveCfg = Debug|x64 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|x64.Build.0 = Debug|x64 - {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release XP|Win32.Build.0 = Release XP|Win32 - {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release XP|x64.ActiveCfg = Release XP|x64 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|Win32.ActiveCfg = Release|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|Win32.Build.0 = Release|Win32 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|x64.ActiveCfg = Release|x64 {8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|x64.Build.0 = Release|x64 - {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {8011C820-B3D5-4034-86EA-FFC30AE6764B}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|Win32.ActiveCfg = Debug|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|Win32.Build.0 = Debug|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|x64.ActiveCfg = Debug|x64 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|x64.Build.0 = Debug|x64 - {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release XP|Win32.Build.0 = Release XP|Win32 - {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release XP|x64.ActiveCfg = Release XP|x64 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|Win32.ActiveCfg = Release|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|Win32.Build.0 = Release|Win32 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|x64.ActiveCfg = Release|x64 {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|x64.Build.0 = Release|x64 - {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {C88C1FBF-59D2-447F-BF57-0BCA8889028F}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|Win32.ActiveCfg = Debug|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|Win32.Build.0 = Debug|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|x64.ActiveCfg = Debug|x64 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|x64.Build.0 = Debug|x64 - {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release XP|Win32.Build.0 = Release XP|Win32 - {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release XP|x64.ActiveCfg = Release XP|x64 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|Win32.ActiveCfg = Release|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|Win32.Build.0 = Release|Win32 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|x64.ActiveCfg = Release|x64 {6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|x64.Build.0 = Release|x64 - {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {6A92BF14-8931-48B1-A571-DEBE9F190616}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|Win32.ActiveCfg = Debug|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|Win32.Build.0 = Debug|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|x64.ActiveCfg = Debug|x64 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Debug|x64.Build.0 = Debug|x64 - {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release XP|Win32.Build.0 = Release XP|Win32 - {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release XP|x64.ActiveCfg = Release XP|x64 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|Win32.ActiveCfg = Release|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|Win32.Build.0 = Release|Win32 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|x64.ActiveCfg = Release|x64 {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.Release|x64.Build.0 = Release|x64 - {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug XP|Win32.ActiveCfg = Debug XP|Win32 - {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug XP|Win32.Build.0 = Debug XP|Win32 - {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug XP|x64.ActiveCfg = Debug XP|x64 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {1B814CC1-EAD4-4A13-B29C-A67B23C9845A}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|Win32.ActiveCfg = Debug|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|Win32.Build.0 = Debug|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|x64.ActiveCfg = Debug|x64 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Debug|x64.Build.0 = Debug|x64 - {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release XP|Win32.ActiveCfg = Release XP|Win32 - {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release XP|Win32.Build.0 = Release XP|Win32 - {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release XP|x64.ActiveCfg = Release XP|x64 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.DebugXP|Win32.Build.0 = DebugXP|Win32 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.DebugXP|x64.ActiveCfg = DebugXP|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|Win32.ActiveCfg = Release|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|Win32.Build.0 = Release|Win32 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|x64.ActiveCfg = Release|x64 {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.Release|x64.Build.0 = Release|x64 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {1ACE209D-D56E-450B-8711-B73E4ACFC38E}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcproj b/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcproj deleted file mode 100644 index 9a309d24ec84..000000000000 --- a/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcproj +++ /dev/null @@ -1,273 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="ntpd-keyword-gen" - ProjectGUID="{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}" - RootNamespace="ntpdkeywordgen" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - SmallerTypeCheck="true" - RuntimeLibrary="1" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(OutDir)keyword-gen-vc90" - BrowseInformation="1" - WarningLevel="4" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)keyword-gen.exe" - Version="0x0400" - LinkIncremental="1" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)keywordgen.pdb" - RandomizedBaseAddress="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts" - PreprocessorDefinitions="_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(OutDir)keyword-gen-vc90" - BrowseInformation="1" - WarningLevel="4" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)keyword-gen.exe" - Version="0x0400" - LinkIncremental="1" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)keywordgen.pdb" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\..\..\ntpd\keyword-gen.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\include\config.h" - > - </File> - <File - RelativePath="..\..\..\..\include\l_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\..\include\lib_strbuf.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_config.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_machine.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_net.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_parser.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_proto.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_rfc2553.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_scanner.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_string.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_syslog.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_types.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcxproj b/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcxproj index 979ceb1ed94b..01f006cd808c 100644 --- a/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcxproj +++ b/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -35,40 +27,27 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> + <ProjectName>keyword-gen</ProjectName> <ProjectGuid>{1B814CC1-EAD4-4A13-B29C-A67B23C9845A}</ProjectGuid> <RootNamespace>ntpdkeywordgen</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> @@ -78,422 +57,139 @@ <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <LinkIncremental>false</LinkIncremental> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(TmpBaseDir)\</OutDir> </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - </Link> - <Bscmake> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - </Link> - <Bscmake> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> + <OutDir>$(TmpBaseDir)\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(TmpBaseDir)\</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <SubSystem>Console</SubSystem> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <SubSystem>Console</SubSystem> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> + <SubSystem>Console</SubSystem> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> + <SubSystem>Console</SubSystem> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> + <SubSystem>Console</SubSystem> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> <ClCompile> - <Optimization>Full</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <ProgramDataBaseFileName>$(OutDir)keyword-gen-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)keyword-gen.exe</OutputFile> - <Version> - </Version> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)keywordgen.pdb</ProgramDatabaseFile> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> + <SubSystem>Console</SubSystem> </Link> <Bscmake> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> @@ -503,21 +199,21 @@ <ClCompile Include="..\..\..\..\ntpd\keyword-gen.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\include\config.h" /> - <ClInclude Include="..\..\..\..\include\l_stdlib.h" /> <ClInclude Include="..\..\..\..\include\lib_strbuf.h" /> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" /> + <ClInclude Include="..\..\..\..\include\l_stdlib.h" /> <ClInclude Include="..\..\..\..\include\ntp_config.h" /> <ClInclude Include="..\..\..\..\include\ntp_machine.h" /> <ClInclude Include="..\..\..\..\include\ntp_net.h" /> - <ClInclude Include="..\..\..\..\ntpd\ntp_parser.h" /> <ClInclude Include="..\..\..\..\include\ntp_proto.h" /> <ClInclude Include="..\..\..\..\include\ntp_rfc2553.h" /> - <ClInclude Include="..\..\..\..\ntpd\ntp_scanner.h" /> <ClInclude Include="..\..\..\..\include\ntp_stdlib.h" /> <ClInclude Include="..\..\..\..\include\ntp_string.h" /> <ClInclude Include="..\..\..\..\include\ntp_syslog.h" /> <ClInclude Include="..\..\..\..\include\ntp_types.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" /> + <ClInclude Include="..\..\..\..\ntpd\ntp_parser.h" /> + <ClInclude Include="..\..\..\..\ntpd\ntp_scanner.h" /> + <ClInclude Include="..\..\include\config.h" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libntp\libntp.vcxproj"> diff --git a/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat b/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat index 3013b8f15c67..b56632738f8b 100644 --- a/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat +++ b/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat @@ -4,23 +4,37 @@ REM helper to invoke keyword-gen and possibly update ntp_keyword.h REM Usage: REM gen-ntp_keyword dir_containing_keyword-gen.exe REM -if "%1"=="" goto Usage -if not exist %1\keyword-gen.exe goto ExeNotFound -%1\keyword-gen.exe ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h + +set HDR_FILE=..\..\..\..\ntpd\ntp_keyword.h +set UTD_FILE=..\..\..\..\ntpd\keyword-gen-utd + +if "{%1}" == "{}" goto Usage +if not exist "%1\keyword-gen.exe" goto ExeNotFound +"%1\keyword-gen.exe" ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h + +REM check if we must create both files from scratch +if not exist "%HDR_FILE%" goto createFiles +if not exist "%UTD_FILE%" goto createFiles + findstr /v diff_ignore_line new_keyword.h > new_keyword_cmp.h -findstr /v diff_ignore_line ..\..\..\..\ntpd\ntp_keyword.h > ntp_keyword_cmp.h +findstr /v diff_ignore_line "%HDR_FILE%" > ntp_keyword_cmp.h set meat_changed=0 fc /L ntp_keyword_cmp.h new_keyword_cmp.h > NUL if errorlevel 1 set meat_changed=1 del ntp_keyword_cmp.h new_keyword_cmp.h if "0"=="%meat_changed%" goto SkipUpdate -xcopy /yf new_keyword.h ..\..\..\..\ntpd\ntp_keyword.h -findstr diff_ignore_line new_keyword.h > ..\..\..\..\ntpd\keyword-gen-utd + +:createFiles +copy /y /v new_keyword.h "%HDR_FILE%" > NUL +findstr diff_ignore_line new_keyword.h > "%UTD_FILE%" echo updated keyword-gen-utd and ntp_keyword.h goto SkipSkipMsg :skipUpdate echo ntp_keyword.h is unchanged +REM 'touch' the files by replacing them with a concatenation of itself and NUL: +copy /b "%HDR_FILE%" + NUL "%HDR_FILE%" > NUL +copy /b "%UTD_FILE%" + NUL "%UTD_FILE%" > NUL :SkipSkipMsg set meat_changed= diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcproj b/ports/winnt/vs2013/ntpd/ntpd.vcproj deleted file mode 100644 index 3dfcfe4aa0f0..000000000000 --- a/ports/winnt/vs2013/ntpd/ntpd.vcproj +++ /dev/null @@ -1,1126 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="ntpd" - ProjectGUID="{CB61F8BF-9637-495C-9087-E8664B400CE0}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpd.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="false" - PrecompiledHeaderFile="$(IntDir)ntpd.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpd-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - OptimizeForWindows98="0" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpd.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\ntpd,..\..\..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - SmallerTypeCheck="true" - RuntimeLibrary="1" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpd.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpd-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - OptimizeForWindows98="0" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\..\ntpd\cmd_args.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\keyword-gen.c" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\ntpd\nt_clockstuff.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_config.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_control.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_crypto.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_filegen.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_io.c" - > - </File> - <File - RelativePath="..\..\ntpd\ntp_iocompletionport.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_leapsec.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_loopfilter.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_monitor.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_parser.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_parser.y" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_peer.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_proto.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_refclock.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_request.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_restrict.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_scanner.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_signd.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_timer.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_util.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntpd-opts.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntpd.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntpsim.c" - > - </File> - <File - RelativePath="..\..\ntpd\ntservice.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\..\..\include\ascii.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\assertions.h" - > - </File> - <File - RelativePath="..\..\..\..\include\binio.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\boolean.h" - > - </File> - <File - RelativePath="..\..\include\clockstuff.h" - > - </File> - <File - RelativePath="..\..\include\config.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\declcond.h" - > - </File> - <File - RelativePath="..\..\include\hopf_PCI_io.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ieee754io.h" - > - </File> - <File - RelativePath="..\..\include\netinet\in.h" - > - </File> - <File - RelativePath="..\..\include\arpa\inet.h" - > - </File> - <File - RelativePath="..\..\include\isc\int.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\interfaceiter.h" - > - </File> - <File - RelativePath="..\..\..\..\include\iosignal.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\jupiter.h" - > - </File> - <File - RelativePath="..\..\..\..\include\l_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\libntp\log.h" - > - </File> - <File - RelativePath="..\..\..\..\include\mbg_gps166.h" - > - </File> - <File - RelativePath="..\..\include\isc\net.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\netaddr.h" - > - </File> - <File - RelativePath="..\..\include\netdb.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_assert.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_calendar.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_cmdargs.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_config.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_control.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_debug.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_filegen.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_fp.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_if.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_io.h" - > - </File> - <File - RelativePath="..\..\include\ntp_iocompletionport.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_keyword.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_leapsec.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_libopts.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_lists.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_machine.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_malloc.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_net.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_parser.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_proto.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_random.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_refclock.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_request.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_rfc2553.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_scanner.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_select.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_string.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_syslog.h" - > - </File> - <File - RelativePath="..\..\include\ntp_timer.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_tty.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_types.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_unixtime.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_worker.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_workimpl.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntpd-opts.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntpd.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntpsim.h" - > - </File> - <File - RelativePath="..\..\include\ntservice.h" - > - </File> - <File - RelativePath="..\..\include\isc\offset.h" - > - </File> - <File - RelativePath="..\..\..\..\sntp\libopts\autoopts\options.h" - > - </File> - <File - RelativePath="..\..\include\sys\param.h" - > - </File> - <File - RelativePath="..\..\include\isc\platform.h" - > - </File> - <File - RelativePath="..\..\..\..\include\recvbuff.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_palisade.h" - > - </File> - <File - RelativePath="..\..\..\..\lib\isc\include\isc\result.h" - > - </File> - <File - RelativePath="..\..\include\sys\socket.h" - > - </File> - <File - RelativePath="..\..\include\syslog.h" - > - </File> - <File - RelativePath="..\..\include\termios.h" - > - </File> - <File - RelativePath="..\..\include\timepps.h" - > - </File> - <File - RelativePath="..\..\..\..\include\timespecops.h" - > - </File> - <File - RelativePath="..\..\..\..\include\timevalops.h" - > - </File> - <File - RelativePath="..\..\include\sys\wait.h" - > - </File> - <File - RelativePath="..\..\include\win32_io.h" - > - </File> - <File - RelativePath="..\..\include\isc\win32os.h" - > - </File> - </Filter> - <Filter - Name="Generated Files" - > - <File - RelativePath="..\..\libntp\messages.rc" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="..\libntp" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="..\libntp" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\libntp\MSG00001.bin" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\ntp_keyword.h" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" - CommandLine=".\gen-ntp_keyword $(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)
" - AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" - Outputs="..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h" - CommandLine=".\gen-ntp_keyword $(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)
" - AdditionalDependencies="..\..\..\..\ntpd\ntp_parser.h" - Outputs="..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\version.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - ShowIncludes="true" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - <File - RelativePath="..\libntp\messages.mc" - > - </File> - </Filter> - <Filter - Name="Reference Clock" - > - <File - RelativePath="..\..\ntpd\hopf_PCI_io.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_acts.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_arbiter.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_arc.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_as2201.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_atom.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_bancomm.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_chronolog.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_chu.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_conf.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_datum.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_dumbclock.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_fg.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_gpsvme.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_heath.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_hopfpci.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_hopfser.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_hpgps.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_irig.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_jjy.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_jupiter.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_leitch.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_local.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_msfees.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_mx4200.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_neoclock4x.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_nmea.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_oncore.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_palisade.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_parse.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_pcf.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_pst.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_ripencc.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_shm.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_tpro.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_true.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_tsyncpci.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_tt560.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_ulink.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_wwv.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_wwvb.c" - > - </File> - <File - RelativePath="..\..\..\..\ntpd\refclock_zyfer.c" - > - </File> - </Filter> - <Filter - Name="Parse Lib" - > - <File - RelativePath="..\..\..\..\libparse\binio.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_computime.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_dcf7000.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_hopf6021.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_meinberg.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_rawdcf.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_rcc8000.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_schmid.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_trimtaip.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_trimtsip.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_varitext.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\clk_wharton.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\data_mbg.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\gpstolfp.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\ieee754io.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\info_trimble.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\mfp_mul.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\parse.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\parse_conf.c" - > - </File> - <File - RelativePath="..\..\..\..\libparse\parsesolaris.c" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\libparse\parsestreams.c" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\libparse\trim_info.c" - > - </File> - </Filter> - <File - RelativePath="..\..\scripts\mkver.bat" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\packageinfo.sh" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpd
" - AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpd
" - AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj b/ports/winnt/vs2013/ntpd/ntpd.vcxproj index 50c9cd98953a..d6ef87b2e953 100644 --- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj +++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -45,41 +37,34 @@ <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> @@ -87,107 +72,42 @@ <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> @@ -195,246 +115,37 @@ <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpd.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpd.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpd.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -447,249 +158,81 @@ <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <IntrinsicFunctions>false</IntrinsicFunctions> - <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpd.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <IntrinsicFunctions>false</IntrinsicFunctions> - <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpd.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <IntrinsicFunctions>false</IntrinsicFunctions> - <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpd.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <IntrinsicFunctions>false</IntrinsicFunctions> - <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <SmallerTypeCheck>true</SmallerTypeCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpd.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpd-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -697,24 +240,35 @@ </Bscmake> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\..\libparse\binio.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_computime.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_dcf7000.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_hopf6021.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_meinberg.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_rawdcf.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_rcc8000.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_schmid.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_trimtaip.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_trimtsip.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_varitext.c" /> + <ClCompile Include="..\..\..\..\libparse\clk_wharton.c" /> + <ClCompile Include="..\..\..\..\libparse\data_mbg.c" /> + <ClCompile Include="..\..\..\..\libparse\gpstolfp.c" /> + <ClCompile Include="..\..\..\..\libparse\ieee754io.c" /> + <ClCompile Include="..\..\..\..\libparse\info_trimble.c" /> + <ClCompile Include="..\..\..\..\libparse\mfp_mul.c" /> + <ClCompile Include="..\..\..\..\libparse\parse.c" /> + <ClCompile Include="..\..\..\..\libparse\parse_conf.c" /> + <ClCompile Include="..\..\..\..\libparse\trim_info.c" /> <ClCompile Include="..\..\..\..\ntpd\cmd_args.c" /> - <ClCompile Include="..\..\..\..\ntpd\keyword-gen.c"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\ntpd\nt_clockstuff.c" /> + <ClCompile Include="..\..\..\..\ntpd\ntpd-opts.c" /> + <ClCompile Include="..\..\..\..\ntpd\ntpd.c" /> + <ClCompile Include="..\..\..\..\ntpd\ntpsim.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_config.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_control.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_crypto.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_filegen.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_io.c" /> - <ClCompile Include="..\..\ntpd\ntp_iocompletionport.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_leapsec.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_loopfilter.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_monitor.c" /> @@ -728,17 +282,6 @@ <ClCompile Include="..\..\..\..\ntpd\ntp_signd.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_timer.c" /> <ClCompile Include="..\..\..\..\ntpd\ntp_util.c" /> - <ClCompile Include="..\..\..\..\ntpd\ntpd-opts.c" /> - <ClCompile Include="..\..\..\..\ntpd\ntpd.c" /> - <ClCompile Include="..\..\..\..\ntpd\ntpsim.c" /> - <ClCompile Include="..\..\ntpd\ntservice.c" /> - <ClCompile Include="version.c"> - <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ShowIncludes> - <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">true</ShowIncludes> - <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ShowIncludes> - <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">true</ShowIncludes> - </ClCompile> - <ClCompile Include="..\..\ntpd\hopf_PCI_io.c" /> <ClCompile Include="..\..\..\..\ntpd\refclock_acts.c" /> <ClCompile Include="..\..\..\..\ntpd\refclock_arbiter.c" /> <ClCompile Include="..\..\..\..\ntpd\refclock_arc.c" /> @@ -780,137 +323,22 @@ <ClCompile Include="..\..\..\..\ntpd\refclock_wwv.c" /> <ClCompile Include="..\..\..\..\ntpd\refclock_wwvb.c" /> <ClCompile Include="..\..\..\..\ntpd\refclock_zyfer.c" /> - <ClCompile Include="..\..\..\..\libparse\binio.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_computime.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_dcf7000.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_hopf6021.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_meinberg.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_rawdcf.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_rcc8000.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_schmid.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_trimtaip.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_trimtsip.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_varitext.c" /> - <ClCompile Include="..\..\..\..\libparse\clk_wharton.c" /> - <ClCompile Include="..\..\..\..\libparse\data_mbg.c" /> - <ClCompile Include="..\..\..\..\libparse\gpstolfp.c" /> - <ClCompile Include="..\..\..\..\libparse\ieee754io.c" /> - <ClCompile Include="..\..\..\..\libparse\info_trimble.c" /> - <ClCompile Include="..\..\..\..\libparse\mfp_mul.c" /> - <ClCompile Include="..\..\..\..\libparse\parse.c" /> - <ClCompile Include="..\..\..\..\libparse\parse_conf.c" /> - <ClCompile Include="..\..\..\..\libparse\parsesolaris.c"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\..\libparse\parsestreams.c"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\..\libparse\trim_info.c" /> - </ItemGroup> - <ItemGroup> - <CustomBuild Include="..\..\..\..\ntpd\ntp_parser.y"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">true</ExcludedFromBuild> - </CustomBuild> - <None Include="..\..\libntp\MSG00001.bin" /> - <None Include="..\libntp\messages.mc" /> - <CustomBuild Include="..\..\scripts\mkver.bat"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">true</ExcludedFromBuild> - </CustomBuild> - <CustomBuild Include="..\..\..\..\packageinfo.sh"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd -</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - </CustomBuild> + <ClCompile Include="..\..\ntpd\hopf_PCI_io.c" /> + <ClCompile Include="..\..\ntpd\ntp_iocompletionport.c" /> + <ClCompile Include="..\..\ntpd\ntservice.c" /> + <ClCompile Include="..\..\ntpd\nt_clockstuff.c" /> + <ClCompile Include="version.c" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\..\include\ascii.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\assertions.h" /> <ClInclude Include="..\..\..\..\include\binio.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\boolean.h" /> - <ClInclude Include="..\..\include\clockstuff.h" /> - <ClInclude Include="..\..\include\config.h" /> - <ClInclude Include="..\..\..\..\ntpd\declcond.h" /> - <ClInclude Include="..\..\include\hopf_PCI_io.h" /> <ClInclude Include="..\..\..\..\include\ieee754io.h" /> - <ClInclude Include="..\..\include\netinet\in.h" /> - <ClInclude Include="..\..\include\arpa\inet.h" /> - <ClInclude Include="..\..\include\isc\int.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h" /> <ClInclude Include="..\..\..\..\include\iosignal.h" /> - <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" /> - <ClInclude Include="..\..\..\..\ntpd\jupiter.h" /> <ClInclude Include="..\..\..\..\include\l_stdlib.h" /> - <ClInclude Include="..\..\..\libntp\log.h" /> <ClInclude Include="..\..\..\..\include\mbg_gps166.h" /> - <ClInclude Include="..\..\include\isc\net.h" /> - <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h" /> - <ClInclude Include="..\..\include\netdb.h" /> <ClInclude Include="..\..\..\..\include\ntp.h" /> + <ClInclude Include="..\..\..\..\include\ntpd.h" /> + <ClInclude Include="..\..\..\..\include\ntpsim.h" /> <ClInclude Include="..\..\..\..\include\ntp_assert.h" /> <ClInclude Include="..\..\..\..\include\ntp_calendar.h" /> <ClInclude Include="..\..\..\..\include\ntp_cmdargs.h" /> @@ -921,104 +349,144 @@ <ClInclude Include="..\..\..\..\include\ntp_fp.h" /> <ClInclude Include="..\..\..\..\include\ntp_if.h" /> <ClInclude Include="..\..\..\..\include\ntp_io.h" /> - <ClInclude Include="..\..\include\ntp_iocompletionport.h" /> - <CustomBuild Include="..\..\..\..\ntpd\ntp_keyword.h"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">.\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) -</Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> - </CustomBuild> - <ClInclude Include="..\..\..\..\ntpd\ntp_leapsec.h" /> <ClInclude Include="..\..\..\..\include\ntp_libopts.h" /> <ClInclude Include="..\..\..\..\include\ntp_lists.h" /> <ClInclude Include="..\..\..\..\include\ntp_machine.h" /> <ClInclude Include="..\..\..\..\include\ntp_malloc.h" /> <ClInclude Include="..\..\..\..\include\ntp_net.h" /> - <ClInclude Include="..\..\..\..\ntpd\ntp_parser.h" /> <ClInclude Include="..\..\..\..\include\ntp_proto.h" /> <ClInclude Include="..\..\..\..\include\ntp_random.h" /> <ClInclude Include="..\..\..\..\include\ntp_refclock.h" /> <ClInclude Include="..\..\..\..\include\ntp_request.h" /> <ClInclude Include="..\..\..\..\include\ntp_rfc2553.h" /> - <ClInclude Include="..\..\..\..\ntpd\ntp_scanner.h" /> <ClInclude Include="..\..\..\..\include\ntp_select.h" /> <ClInclude Include="..\..\..\..\include\ntp_stdlib.h" /> <ClInclude Include="..\..\..\..\include\ntp_string.h" /> <ClInclude Include="..\..\..\..\include\ntp_syslog.h" /> - <ClInclude Include="..\..\include\ntp_timer.h" /> <ClInclude Include="..\..\..\..\include\ntp_tty.h" /> <ClInclude Include="..\..\..\..\include\ntp_types.h" /> <ClInclude Include="..\..\..\..\include\ntp_unixtime.h" /> <ClInclude Include="..\..\..\..\include\ntp_worker.h" /> <ClInclude Include="..\..\..\..\include\ntp_workimpl.h" /> - <ClInclude Include="..\..\..\..\ntpd\ntpd-opts.h" /> - <ClInclude Include="..\..\..\..\include\ntpd.h" /> - <ClInclude Include="..\..\..\..\include\ntpsim.h" /> - <ClInclude Include="..\..\include\ntservice.h" /> - <ClInclude Include="..\..\include\isc\offset.h" /> - <ClInclude Include="..\..\..\..\sntp\libopts\autoopts\options.h" /> - <ClInclude Include="..\..\include\sys\param.h" /> - <ClInclude Include="..\..\include\isc\platform.h" /> <ClInclude Include="..\..\..\..\include\recvbuff.h" /> - <ClInclude Include="..\..\..\..\ntpd\refclock_palisade.h" /> + <ClInclude Include="..\..\..\..\include\timespecops.h" /> + <ClInclude Include="..\..\..\..\include\timevalops.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\assertions.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\boolean.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h" /> <ClInclude Include="..\..\..\..\lib\isc\include\isc\result.h" /> - <ClInclude Include="..\..\include\sys\socket.h" /> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\int.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\netdb.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\offset.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h" /> + <ClInclude Include="..\..\..\..\ntpd\declcond.h" /> + <ClInclude Include="..\..\..\..\ntpd\jupiter.h" /> + <ClInclude Include="..\..\..\..\ntpd\ntpd-opts.h" /> + <ClInclude Include="..\..\..\..\ntpd\ntp_keyword.h" /> + <ClInclude Include="..\..\..\..\ntpd\ntp_leapsec.h" /> + <CustomBuild Include="..\..\..\..\ntpd\ntp_parser.h"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\gen-ntp_keyword $(TmpBaseDir) +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call .\gen-ntp_keyword.bat $(TmpBaseDir) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call .\gen-ntp_keyword.bat $(TmpBaseDir) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call .\gen-ntp_keyword.bat $(TmpBaseDir) +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call .\gen-ntp_keyword.bat $(TmpBaseDir) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call .\gen-ntp_keyword.bat $(TmpBaseDir) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd</Outputs> + </CustomBuild> + <ClInclude Include="..\..\..\..\ntpd\ntp_scanner.h" /> + <ClInclude Include="..\..\..\..\ntpd\refclock_palisade.h" /> + <ClInclude Include="..\..\..\..\sntp\libopts\autoopts\options.h" /> + <ClInclude Include="..\..\include\arpa\inet.h" /> + <ClInclude Include="..\..\include\clockstuff.h" /> + <ClInclude Include="..\..\include\config.h" /> + <ClInclude Include="..\..\include\hopf_PCI_io.h" /> + <ClInclude Include="..\..\include\ntp_iocompletionport.h" /> + <ClInclude Include="..\..\include\ntp_timer.h" /> + <ClInclude Include="..\..\include\ntservice.h" /> <ClInclude Include="..\..\include\syslog.h" /> + <ClInclude Include="..\..\include\sys\param.h" /> + <ClInclude Include="..\..\include\sys\wait.h" /> <ClInclude Include="..\..\include\termios.h" /> <ClInclude Include="..\..\include\timepps.h" /> - <ClInclude Include="..\..\..\..\include\timespecops.h" /> - <ClInclude Include="..\..\..\..\include\timevalops.h" /> - <ClInclude Include="..\..\include\sys\wait.h" /> <ClInclude Include="..\..\include\win32_io.h" /> - <ClInclude Include="..\..\include\isc\win32os.h" /> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\libntp\messages.rc"> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">..\libntp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ResourceCompile> + <ResourceCompile Include="..\..\libntp\messages.rc" /> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\packageinfo.sh"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) +</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + </AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> + </CustomBuild> + <None Include="..\..\libntp\MSG00001.bin" /> + <None Include="..\libntp\messages.mc" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libntp\libntp.vcxproj"> diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters index c125d105b9be..32c11930914f 100644 --- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters +++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters @@ -2,34 +2,31 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{31ad5712-dbda-49a0-abf3-c24f1d3b3822}</UniqueIdentifier> + <UniqueIdentifier>{2cbfaff6-f124-4847-a42e-8fcda8f2ccde}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{e8591cc7-e9b7-4fea-9747-d219a1ce73cf}</UniqueIdentifier> + <UniqueIdentifier>{7c80ca48-41d3-4140-9f66-d1f9b0819935}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Generated Files"> - <UniqueIdentifier>{952e91f9-804e-48f6-b49b-6b47ef88bfcb}</UniqueIdentifier> + <UniqueIdentifier>{ee743a49-b45f-4111-99c1-b763c58855eb}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{12a98ad7-139f-4258-8886-ed369f10cae6}</UniqueIdentifier> + <UniqueIdentifier>{b8223a11-17dc-43a1-8a4d-71cb38696349}</UniqueIdentifier> <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> </Filter> <Filter Include="Reference Clock"> - <UniqueIdentifier>{ca4a4827-79af-4bbf-abbb-58d6e6e6fdc3}</UniqueIdentifier> + <UniqueIdentifier>{42cb2adf-a7f2-44fa-bac2-4e7123023aab}</UniqueIdentifier> </Filter> <Filter Include="Parse Lib"> - <UniqueIdentifier>{5afb644e-b0fd-4fcb-96a3-2bac7c09a7cd}</UniqueIdentifier> + <UniqueIdentifier>{46c3cccd-994c-4611-982a-cc7e02e0bb60}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\..\ntpd\cmd_args.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\ntpd\keyword-gen.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\ntpd\nt_clockstuff.c"> <Filter>Source Files</Filter> </ClCompile> @@ -102,9 +99,6 @@ <ClCompile Include="..\..\ntpd\ntservice.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="version.c"> - <Filter>Generated Files</Filter> - </ClCompile> <ClCompile Include="..\..\ntpd\hopf_PCI_io.c"> <Filter>Reference Clock</Filter> </ClCompile> @@ -288,23 +282,12 @@ <ClCompile Include="..\..\..\..\libparse\parse_conf.c"> <Filter>Parse Lib</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\libparse\parsesolaris.c"> - <Filter>Parse Lib</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\libparse\parsestreams.c"> - <Filter>Parse Lib</Filter> - </ClCompile> <ClCompile Include="..\..\..\..\libparse\trim_info.c"> <Filter>Parse Lib</Filter> </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\..\libntp\MSG00001.bin"> - <Filter>Generated Files</Filter> - </None> - <None Include="..\libntp\messages.mc"> - <Filter>Resource Files</Filter> - </None> + <ClCompile Include="version.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\..\include\ascii.h"> @@ -334,15 +317,9 @@ <ClInclude Include="..\..\..\..\include\ieee754io.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\netinet\in.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\include\arpa\inet.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\int.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h"> <Filter>Header Files</Filter> </ClInclude> @@ -358,21 +335,12 @@ <ClInclude Include="..\..\..\..\include\l_stdlib.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\libntp\log.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\mbg_gps166.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\net.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\netdb.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\ntp.h"> <Filter>Header Files</Filter> </ClInclude> @@ -409,6 +377,9 @@ <ClInclude Include="..\..\include\ntp_iocompletionport.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\..\ntpd\ntp_keyword.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\..\..\..\ntpd\ntp_leapsec.h"> <Filter>Header Files</Filter> </ClInclude> @@ -427,9 +398,6 @@ <ClInclude Include="..\..\..\..\include\ntp_net.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\ntpd\ntp_parser.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\ntp_proto.h"> <Filter>Header Files</Filter> </ClInclude> @@ -490,18 +458,12 @@ <ClInclude Include="..\..\include\ntservice.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\offset.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\sntp\libopts\autoopts\options.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\..\include\sys\param.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\platform.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\recvbuff.h"> <Filter>Header Files</Filter> </ClInclude> @@ -511,9 +473,6 @@ <ClInclude Include="..\..\..\..\lib\isc\include\isc\result.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\sys\socket.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\include\syslog.h"> <Filter>Header Files</Filter> </ClInclude> @@ -535,7 +494,28 @@ <ClInclude Include="..\..\include\win32_io.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\win32os.h"> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\offset.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\netdb.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\int.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> @@ -545,15 +525,17 @@ </ResourceCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\..\ntpd\ntp_parser.y"> - <Filter>Source Files</Filter> - </CustomBuild> - <CustomBuild Include="..\..\..\..\ntpd\ntp_keyword.h"> + <None Include="..\..\libntp\MSG00001.bin"> + <Filter>Generated Files</Filter> + </None> + <None Include="..\libntp\messages.mc"> + <Filter>Resource Files</Filter> + </None> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\ntpd\ntp_parser.h"> <Filter>Header Files</Filter> </CustomBuild> - <CustomBuild Include="..\..\scripts\mkver.bat"> - <Filter>Source Files</Filter> - </CustomBuild> <CustomBuild Include="..\..\..\..\packageinfo.sh" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcproj b/ports/winnt/vs2013/ntpdate/ntpdate.vcproj deleted file mode 100644 index 85a4bef373ca..000000000000 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcproj +++ /dev/null @@ -1,362 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="ntpdate" - ProjectGUID="{2789A62E-3F46-44F1-AAF0-816CD23C2911}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpdate.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC)" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntpdate.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdate-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpdate.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC)" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpdate.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdate-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\..\ntpdate\ntpdate.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\version.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\include\config.h" - > - </File> - <File - RelativePath="..\..\include\isc\net.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_fp.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_io.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_machine.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_net.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_select.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_stdlib.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_string.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_syslog.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_unixtime.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpdate\ntpdate.h" - > - </File> - <File - RelativePath="..\..\include\syslog.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - <File - RelativePath="..\..\..\..\packageinfo.sh" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdate
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdate
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj index 5591fb7ae15f..ccf5debfdda0 100644 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj +++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -38,37 +30,25 @@ <ProjectGuid>{2789A62E-3F46-44F1-AAF0-816CD23C2911}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> @@ -80,474 +60,125 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> - <HeaderFileName /> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -556,126 +187,40 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpdate.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdate.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdate-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -687,8 +232,6 @@ <ClCompile Include="version.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\include\config.h" /> - <ClInclude Include="..\..\include\isc\net.h" /> <ClInclude Include="..\..\..\..\include\ntp.h" /> <ClInclude Include="..\..\..\..\include\ntp_fp.h" /> <ClInclude Include="..\..\..\..\include\ntp_io.h" /> @@ -699,43 +242,37 @@ <ClInclude Include="..\..\..\..\include\ntp_string.h" /> <ClInclude Include="..\..\..\..\include\ntp_syslog.h" /> <ClInclude Include="..\..\..\..\include\ntp_unixtime.h" /> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" /> <ClInclude Include="..\..\..\..\ntpdate\ntpdate.h" /> + <ClInclude Include="..\..\include\config.h" /> <ClInclude Include="..\..\include\syslog.h" /> </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\..\packageinfo.sh"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters index b2ec7e63204f..8eea86e570a8 100644 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters +++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters @@ -2,15 +2,15 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{a889d71b-7d63-4e86-a764-a4075ede9e24}</UniqueIdentifier> + <UniqueIdentifier>{a9c05e13-5296-4958-8c8a-bbaeb940ba64}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{66b7a61f-7329-4b83-8b39-a15703b336bd}</UniqueIdentifier> + <UniqueIdentifier>{6cb269b2-f6e6-4efe-ad40-385f8d6e4d1f}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{7acd1484-cc13-4187-a393-39ea3cb89649}</UniqueIdentifier> + <UniqueIdentifier>{592dc90e-8075-4d56-b888-2ba3eaa2030e}</UniqueIdentifier> <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> </Filter> </ItemGroup> @@ -26,9 +26,6 @@ <ClInclude Include="..\..\include\config.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\include\isc\net.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\ntp.h"> <Filter>Header Files</Filter> </ClInclude> @@ -65,6 +62,9 @@ <ClInclude Include="..\..\include\syslog.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\..\packageinfo.sh" /> diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcproj b/ports/winnt/vs2013/ntpdc/ntpdc.vcproj deleted file mode 100644 index 5fd301ddf8b5..000000000000 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcproj +++ /dev/null @@ -1,367 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="ntpdc" - ProjectGUID="{8011C820-B3D5-4034-86EA-FFC30AE6764B}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpdc.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntpdc.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdc-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpdc.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpdc.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpdc-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\..\ntpdc\ntpdc-opts.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\ntpdc\ntpdc.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\ntpdc\ntpdc_ops.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - WarningLevel="3" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\version.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\..\..\include\ntp_assert.h" - > - </File> - <File - RelativePath="..\..\..\..\include\ntp_lineedit.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpdc\ntpdc.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - <File - RelativePath="..\..\..\..\packageinfo.sh" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdc
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpdc
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj index a16ab0551cdd..cbed89d25d2d 100644 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj +++ b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -38,37 +30,25 @@ <ProjectGuid>{8011C820-B3D5-4034-86EA-FFC30AE6764B}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> @@ -80,474 +60,125 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> - <HeaderFileName /> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -556,126 +187,40 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpdc.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpdc.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpdc-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -683,36 +228,9 @@ </Bscmake> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\ntpdc\ntpdc-opts.c"> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">Level3</WarningLevel> - </ClCompile> - <ClCompile Include="..\..\..\..\ntpdc\ntpdc.c"> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">Level3</WarningLevel> - </ClCompile> - <ClCompile Include="..\..\..\..\ntpdc\ntpdc_ops.c"> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level3</WarningLevel> - <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">Level3</WarningLevel> - </ClCompile> + <ClCompile Include="..\..\..\..\ntpdc\ntpdc-opts.c" /> + <ClCompile Include="..\..\..\..\ntpdc\ntpdc.c" /> + <ClCompile Include="..\..\..\..\ntpdc\ntpdc_ops.c" /> <ClCompile Include="version.c" /> </ItemGroup> <ItemGroup> @@ -722,38 +240,30 @@ </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\..\packageinfo.sh"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters index 8e83e7631a72..11295ace75e0 100644 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters +++ b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters @@ -2,15 +2,15 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{f9cafbdf-2c38-46c2-9c83-4e177c213fd8}</UniqueIdentifier> + <UniqueIdentifier>{d89987d8-7f2b-44ac-8fde-655708f3caa4}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{5fa1d807-8b78-4e72-b44c-d698dd579a13}</UniqueIdentifier> + <UniqueIdentifier>{5eefdf30-92a6-4318-80fb-dc80ee3091da}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{4c7e2cb5-4dc3-4551-b0a2-11b30ecd802c}</UniqueIdentifier> + <UniqueIdentifier>{89efa9a7-ae12-44f9-b06a-197aee209dba}</UniqueIdentifier> <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> </Filter> </ItemGroup> diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcproj b/ports/winnt/vs2013/ntpq/ntpq.vcproj deleted file mode 100644 index 440b38bae97a..000000000000 --- a/ports/winnt/vs2013/ntpq/ntpq.vcproj +++ /dev/null @@ -1,357 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="ntpq" - ProjectGUID="{6A92BF14-8931-48B1-A571-DEBE9F190616}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpq.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(IntDir)ntpq.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpq-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="0" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(PlatformName)-bin\$(ConfigurationName)\" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-tmp\$(ConfigurationName)\$(TargetName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="$(IntDir)ntpq.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\sntp\libopts" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - MinimalRebuild="false" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="$(IntDir)ntpq.pch" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(OutDir)ntpq-vc90" - BrowseInformation="1" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib" - OutputFile="$(OutDir)$(ProjectName).exe" - Version="0x0400" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(ProjectName).pdb" - SubSystem="1" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(IntDir)/$(ProjectName).bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\..\ntpq\ntpq-opts.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\ntpq\ntpq-subs.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\..\..\ntpq\ntpq.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\version.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\..\..\include\ntp_lineedit.h" - > - </File> - <File - RelativePath="..\..\..\..\ntpq\ntpq.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - <File - RelativePath="..\..\..\..\packageinfo.sh" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpq
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="echo Using NT Shell Script to generate version.c
..\..\scripts\mkver.bat -P ntpq
" - Outputs="$(ProjectDir)version.c" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcxproj b/ports/winnt/vs2013/ntpq/ntpq.vcxproj index e5f1f8430c18..c7476d8ee268 100644 --- a/ports/winnt/vs2013/ntpq/ntpq.vcxproj +++ b/ports/winnt/vs2013/ntpq/ntpq.vcxproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug XP|Win32"> - <Configuration>Debug XP</Configuration> + <ProjectConfiguration Include="DebugXP|Win32"> + <Configuration>DebugXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug XP|x64"> - <Configuration>Debug XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +13,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|Win32"> - <Configuration>Release XP</Configuration> + <ProjectConfiguration Include="ReleaseXP|Win32"> + <Configuration>ReleaseXP</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release XP|x64"> - <Configuration>Release XP</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -44,142 +36,72 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120_xp</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v120</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <PlatformToolset>v120_xp</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug.props" /> + <Import Project="..\common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\debug-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + <Import Project="..\release-x64.props" /> + <Import Project="..\common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> - <OutDir>$(SolutionDir)$(Platform)-bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\</IntDir> - <ExtensionsToDeleteOnClean>*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)</ExtensionsToDeleteOnClean> - <LinkIncremental>false</LinkIncremental> - <GenerateManifest>false</GenerateManifest> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> @@ -187,249 +109,35 @@ <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpq.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpq.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - </Link> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'"> - <Midl> - <TypeLibraryName>$(IntDir)ntpq.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> - </Midl> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <WholeProgramOptimization>true</WholeProgramOptimization> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - </ResourceCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -442,240 +150,77 @@ <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling /> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention /> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'"> <Midl> <TypeLibraryName>$(IntDir)ntpq.tlb</TypeLibraryName> <HeaderFileName> </HeaderFileName> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpq.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile> </Bscmake> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> + <TargetEnvironment>X64</TargetEnvironment> <TypeLibraryName>$(IntDir)ntpq.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <HeaderFileName /> </Midl> <ClCompile> - <Optimization>Disabled</Optimization> - <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>$(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>false</MinimalRebuild> - <ExceptionHandling> - </ExceptionHandling> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeaderOutputFile>$(IntDir)ntpq.pch</PrecompiledHeaderOutputFile> - <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> - <ObjectFileName>$(IntDir)</ObjectFileName> - <ProgramDataBaseFileName>$(OutDir)ntpq-vc90</ProgramDataBaseFileName> - <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FunctionLevelLinking>true</FunctionLevelLinking> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> - <ExpandAttributedSource>true</ExpandAttributedSource> - <AssemblerOutput>All</AssemblerOutput> - <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> + <AdditionalIncludeDirectories>..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> - <Version> - </Version> - <SuppressStartupBanner>true</SuppressStartupBanner> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <GenerateMapFile>true</GenerateMapFile> - <MapExports>true</MapExports> - <OptimizeReferences>false</OptimizeReferences> - <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -694,38 +239,30 @@ </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\..\packageinfo.sh"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq -</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName) </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|Win32'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release XP|x64'">$(ProjectDir)version.c;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters b/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters index 0ac851d64a39..80276a32547e 100644 --- a/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters +++ b/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters @@ -2,15 +2,15 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{726ba7d7-a7f0-4d12-8713-79de7ce8f776}</UniqueIdentifier> + <UniqueIdentifier>{8e203dcf-b90d-477e-9cb0-da399ca2eee6}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{e0db3665-e32f-4959-97ac-4cfa2556ef19}</UniqueIdentifier> + <UniqueIdentifier>{587344a2-88e1-47c8-9dd7-a7a728ef9a63}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{29c4355d-bb94-4347-964f-5d1c731481d5}</UniqueIdentifier> + <UniqueIdentifier>{229bbf9c-4aae-4515-9d9e-4be8dc1f0e04}</UniqueIdentifier> <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> </Filter> </ItemGroup> diff --git a/ports/winnt/vs2013/release-x64.props b/ports/winnt/vs2013/release-x64.props new file mode 100644 index 000000000000..149182efaef3 --- /dev/null +++ b/ports/winnt/vs2013/release-x64.props @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <Optimization>Full</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>$(OPENSSL64_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <AdditionalDependencies>$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup /> +</Project>
\ No newline at end of file diff --git a/ports/winnt/vs2013/release.props b/ports/winnt/vs2013/release.props new file mode 100644 index 000000000000..d32ea70c15a6 --- /dev/null +++ b/ports/winnt/vs2013/release.props @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion> + <_PropertySheetDisplayName>release-x86</_PropertySheetDisplayName> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <Optimization>Full</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>$(OPENSSL_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <AdditionalDependencies>$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup /> +</Project>
\ No newline at end of file |