From: Juergen Perlinger Date: Sun, 12 Apr 2015 17:49:34 +0000 (+0200) Subject: WinBuild: cleanup of VS2008/VS2013 build, add 64bit build to VS2008 X-Git-Tag: NTP_4_3_27~1^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b099d30771a3a51ca1700e7a71c84abae5be5c8d;p=thirdparty%2Fntp.git WinBuild: cleanup of VS2008/VS2013 build, add 64bit build to VS2008 bk: 552ab02eUP3bq788fCjK4583HdJcEg --- diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h index f56df9d0b..e313272fd 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 deleted file mode 100644 index 14573a25c..000000000 --- a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def +++ /dev/null @@ -1,9 +0,0 @@ -LIBRARY "loopback-ppsapi-provider.dll" - -EXPORTS - ppsapi_prov_init - prov_time_pps_create - prov_time_pps_destroy - prov_time_pps_fetch - prov_time_pps_kcbind - prov_time_pps_setparams \ No newline at end of file diff --git a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h index 5541e333e..6e7ef1f8d 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 #include typedef __int32 int32; diff --git a/ports/winnt/ppsapi/loopback/src/timepps.h b/ports/winnt/ppsapi/loopback/src/timepps.h index 3a7e80662..c3042ef47 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 000000000..53edd64ab --- /dev/null +++ b/ports/winnt/vs2008/common.vsprops @@ -0,0 +1,53 @@ + + + + + + + diff --git a/ports/winnt/vs2008/debug-x64.vsprops b/ports/winnt/vs2008/debug-x64.vsprops new file mode 100644 index 000000000..06f6f204e --- /dev/null +++ b/ports/winnt/vs2008/debug-x64.vsprops @@ -0,0 +1,20 @@ + + + + + diff --git a/ports/winnt/vs2008/debug.vsprops b/ports/winnt/vs2008/debug.vsprops new file mode 100644 index 000000000..0a1619748 --- /dev/null +++ b/ports/winnt/vs2008/debug.vsprops @@ -0,0 +1,20 @@ + + + + + diff --git a/ports/winnt/vs2008/instsrv/instsrv.vcproj b/ports/winnt/vs2008/instsrv/instsrv.vcproj index e3324a66e..335ad7f3d 100644 --- a/ports/winnt/vs2008/instsrv/instsrv.vcproj +++ b/ports/winnt/vs2008/instsrv/instsrv.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj index b87d1782d..ad27104d4 100644 --- a/ports/winnt/vs2008/libntp/libntp.vcproj +++ b/ports/winnt/vs2008/libntp/libntp.vcproj @@ -10,16 +10,18 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -939,7 +1046,7 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj index 6bf76fe93..fd89859a6 100644 --- a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj +++ b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/ports/winnt/vs2008/ntp.sln b/ports/winnt/vs2008/ntp.sln index e5556d904..5b6f1fa07 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 9a309d24e..9bd9e6f9d 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + new_keyword.h +if "x%1"=="x" goto Usage +if not exist "%1\keyword-gen.exe" goto ExeNotFound +"%1\keyword-gen.exe" ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h 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 set meat_changed=0 @@ -14,13 +14,15 @@ 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 +copy /y /v new_keyword.h ..\..\..\..\ntpd\ntp_keyword.h findstr diff_ignore_line new_keyword.h > ..\..\..\..\ntpd\keyword-gen-utd echo updated keyword-gen-utd and ntp_keyword.h goto SkipSkipMsg :skipUpdate echo ntp_keyword.h is unchanged +REM 'touch' the file by replacing it with a concatenation of itself and NUL: +copy /b ..\..\..\..\ntpd\ntp_keyword.h+NUL: ..\..\..\..\ntpd\ntp_keyword.h :SkipSkipMsg set meat_changed= diff --git a/ports/winnt/vs2008/ntpd/ntpd.vcproj b/ports/winnt/vs2008/ntpd/ntpd.vcproj index 3dfcfe4aa..c5689ce6f 100644 --- a/ports/winnt/vs2008/ntpd/ntpd.vcproj +++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj @@ -10,20 +10,20 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -302,26 +355,6 @@ RelativePath="..\..\..\..\ntpd\ntp_parser.c" > - - - - - - - - @@ -374,6 +407,10 @@ RelativePath="..\..\ntpd\ntservice.c" > + + + + @@ -546,6 +587,50 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1095,6 +1073,22 @@ Name="VCCustomBuildTool" /> + + + + + + + + + + + + diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj index 85a4bef37..847c55a17 100644 --- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj +++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + diff --git a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj index 5fd301ddf..ba1f8c5d1 100644 --- a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj +++ b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/ports/winnt/vs2008/ntpq/ntpq.vcproj b/ports/winnt/vs2008/ntpq/ntpq.vcproj index 440b38bae..3d8c9a3c5 100644 --- a/ports/winnt/vs2008/ntpq/ntpq.vcproj +++ b/ports/winnt/vs2008/ntpq/ntpq.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/ports/winnt/vs2008/release-x64.vsprops b/ports/winnt/vs2008/release-x64.vsprops new file mode 100644 index 000000000..23cb8a8cb --- /dev/null +++ b/ports/winnt/vs2008/release-x64.vsprops @@ -0,0 +1,21 @@ + + + + + diff --git a/ports/winnt/vs2008/release.vsprops b/ports/winnt/vs2008/release.vsprops new file mode 100644 index 000000000..4c7c513ad --- /dev/null +++ b/ports/winnt/vs2008/release.vsprops @@ -0,0 +1,21 @@ + + + + + diff --git a/ports/winnt/vs2013/common.props b/ports/winnt/vs2013/common.props new file mode 100644 index 000000000..8b368d124 --- /dev/null +++ b/ports/winnt/vs2013/common.props @@ -0,0 +1,59 @@ + + + + + + $(SolutionDir)\$(Platform)-out\$(Configuration) + $(SolutionDir)\$(Platform)-tmp\$(Configuration) + + + <_ProjectFileVersion>12.0.30501.0 + $(OutBaseDir)\ + $(TmpBaseDir)\$(TargetName)\ + false + + + + $(IntDir)BuildLog.htm + + + $(VC_IncludePath);..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\lib\isc\include;..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) + _CONSOLE;_WINDOWS;WIN32;SYS_WINNT;HAVE_CONFIG_H;HAVE_ARC4RANDOM_BUF;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + + true + false + $(IntDir) + $(IntDir) + $(IntDir) + true + true + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + Level3 + + + ws2_32.lib;%(AdditionalDependencies) + 4.2 + true + $(TmpBaseDir);%(AdditionalLibraryDirectories) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + false + + + + + $(OutBaseDir) + + + $(TmpBaseDir) + + + \ 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 000000000..938b6f21b --- /dev/null +++ b/ports/winnt/vs2013/debug-x64.props @@ -0,0 +1,23 @@ + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + + Disabled + true + $(OPENSSL64_INC);%(AdditionalIncludeDirectories) + _DEBUG;OPENSSL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + $(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) + MachineX64 + + + + \ 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 000000000..380885908 --- /dev/null +++ b/ports/winnt/vs2013/debug.props @@ -0,0 +1,24 @@ + + + + + + + <_ProjectFileVersion>12.0.30501.0 + <_PropertySheetDisplayName>debug-x86 + + + + Disabled + true + $(OPENSSL_INC);%(AdditionalIncludeDirectories) + _DEBUG;OPENSSL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + $(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) + MachineX86 + + + + \ 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 e3324a66e..000000000 --- a/ports/winnt/vs2013/instsrv/instsrv.vcproj +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/instsrv/instsrv.vcxproj b/ports/winnt/vs2013/instsrv/instsrv.vcxproj index 69360a4f4..e6af463ca 100644 --- a/ports/winnt/vs2013/instsrv/instsrv.vcxproj +++ b/ports/winnt/vs2013/instsrv/instsrv.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -39,37 +31,25 @@ instsrv - - Application - v120 - false - MultiByte - - - Application - v120_xp - false - MultiByte - - + Application v120 false MultiByte - + Application v120_xp false MultiByte - + Application v120 false MultiByte - + Application v120_xp false @@ -81,464 +61,127 @@ false MultiByte - + Application - v120_xp + v120 false MultiByte - - - - - - - - - + - + + - + - + + - + - + + - + - + + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false + <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - + $(IntDir)Instsrv.tlb - Disabled - false - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreadedDebug - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - EditAndContinue - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - All - true + ..\..\instsrv;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - Default - false - - MachineX86 - true - true - false - false - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)Instsrv.tlb - - - - - Disabled - false - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - EditAndContinue - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - Default - false - - - MachineX86 - true - true - false - false - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)Instsrv.tlb - - - - - Disabled - false - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - EditAndContinue - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - All - true - - - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)Instsrv.tlb - Disabled - false - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - EditAndContinue - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\instsrv;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)Instsrv.tlb - Full - AnySuitable - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - MultiThreaded - true - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - false - - MachineX86 - true - true - UseLinkTimeCodeGeneration - true - true true $(IntDir)$(ProjectName).bsc - + $(IntDir)Instsrv.tlb - Full - AnySuitable - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - MultiThreaded - true - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true true - NoExtensions - true - true - All - true + ..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - false - - - MachineX86 - true - true - UseLinkTimeCodeGeneration - true - true true @@ -547,124 +190,41 @@ + X64 $(IntDir)Instsrv.tlb - - + - Full - AnySuitable - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - MultiThreaded - true - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\instsrv;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - false - - - true - true - UseLinkTimeCodeGeneration - true - true true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)Instsrv.tlb - - + - Full - AnySuitable - ..\..\..\..\include;..\..\include;..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;_WINDOWS;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - MultiThreaded - true - $(IntDir)Instsrv.pch - $(IntDir) - $(IntDir) - $(OutDir)instsrv-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true true - NoExtensions - true - true - All - true + ..\..\instsrv;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - oldnames.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - false - - - true - true - UseLinkTimeCodeGeneration - true - true true @@ -673,6 +233,35 @@ + + + + + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat -P $(ProjectName) + + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat -P $(ProjectName) + + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + .\version.c;%(Outputs) + diff --git a/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters b/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters index b2d70f656..a002fdb88 100644 --- a/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters +++ b/ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters @@ -2,15 +2,15 @@ - {e8390c50-c913-4569-99e0-d09ea4a59555} + {88b66c4c-94b1-4f5b-9746-4fe09cdfae66} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {bde2853f-cf7f-4658-89e7-21f3b87fc2e2} + {d9dc516d-d575-4027-8a48-b67dc1ba58c3} h;hpp;hxx;hm;inl - {21cb96d9-ac72-4879-98fd-1e8ed146b4be} + {afc3883c-9da2-4632-8941-c77432dbd317} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe @@ -18,5 +18,11 @@ Source Files + + Source Files + + + + \ 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 f9f57507d..000000000 --- a/ports/winnt/vs2013/libntp/libntp.vcproj +++ /dev/null @@ -1,936 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj index 1289c2d77..e7db9cd8a 100644 --- a/ports/winnt/vs2013/libntp/libntp.vcxproj +++ b/ports/winnt/vs2013/libntp/libntp.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -38,42 +30,28 @@ {400FBFCB-462E-40D0-B06B-3B74E3FFFD00} - - StaticLibrary - v120 - false - MultiByte - true - - - StaticLibrary - v120_xp - false - MultiByte - true - - + StaticLibrary v120 false MultiByte true - + StaticLibrary v120_xp false MultiByte true - + StaticLibrary v120 false MultiByte true - + StaticLibrary v120_xp false @@ -87,9 +65,9 @@ MultiByte true - + StaticLibrary - v120_xp + v120 false MultiByte true @@ -97,188 +75,61 @@ - - - - - - - - - + - + + - + - + + - + - + + - + - + + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ + <_ProjectFileVersion>12.0.30501.0 - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ + $(TmpBaseDir)\ - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ + + $(TmpBaseDir)\ - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ + $(TmpBaseDir)\ - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ + + $(TmpBaseDir)\ - - - Disabled - false - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreadedDebug - $(IntDir)libntp.pch - $IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - NoListing - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - Disabled - false - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)libntp.pch - $IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - NoListing - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - Disabled - false - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)libntp.pch - $IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - NoListing - true - + + $(TmpBaseDir)\ + + + $(TmpBaseDir)\ + + - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 @@ -289,38 +140,9 @@ $(IntDir)$(ProjectName).bsc - - - Disabled - false - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)libntp.pch - $IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - NoListing - true - + - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 @@ -331,39 +153,10 @@ $(IntDir)$(ProjectName).bsc - - - Full - AnySuitable - true - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - false - false - true - false - - MultiThreaded - false - $(IntDir)libntp.pch - $(IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - StreamingSIMDExtensions2 - true - true - NoListing - true - + + + X64 + NDEBUG;%(PreprocessorDefinitions) 0x0409 @@ -376,42 +169,9 @@ $(IntDir)$(ProjectName).bsc - - - Full - AnySuitable - true - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - false - false - true - false - - - MultiThreaded - false - $(IntDir)libntp.pch - $(IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - NoExtensions - true - true - NoListing - true - + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 @@ -422,42 +182,9 @@ $(IntDir)$(ProjectName).bsc - - - Full - AnySuitable - true - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - false - false - true - false - - - MultiThreaded - false - $(IntDir)libntp.pch - $(IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - StreamingSIMDExtensions2 - true - true - NoListing - true - + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 @@ -468,42 +195,12 @@ $(IntDir)$(ProjectName).bsc - - - Full - AnySuitable - true - $(VC_IncludePath);..\..\libntp;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - false - false - true - false - - - MultiThreaded - false - $(IntDir)libntp.pch - $(IntDir) - $(IntDir) - $(IntDir) - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - NoExtensions - true - true - NoListing - true - + + + X64 + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 @@ -515,10 +212,7 @@ - - - @@ -526,51 +220,31 @@ - - - + - - - - - - - - - - - - - - - - - - @@ -582,75 +256,80 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -659,7 +338,6 @@ - @@ -675,65 +353,75 @@ - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Message Compiler - Message Compiler - Message Compiler - Message Compiler + Message Compiler mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) - mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) + mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) + %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) + %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) + Message Compiler mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) - mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) - - %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) - %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) - %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) Message Compiler - Message Compiler - Message Compiler - Message Compiler + Message Compiler mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) - mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) + mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) + %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) + %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) + Message Compiler mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) - mc -h %(RootDir)%(Directory) -r %(RootDir)%(Directory) -e h %(FullPath) - - %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) - %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) - %(RootDir)%(Directory)%(Filename).rc;%(RootDir)%(Directory)%(Filename).h;%(RootDir)%(Directory)msg00001.bin;%(Outputs) diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters index 10596c686..a30dd4400 100644 --- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters +++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters @@ -2,18 +2,18 @@ - {df2922e3-313f-4661-9019-a88cb5be1bee} + {9b4d7229-201b-44b0-8b6d-c58920cf47a4} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {70e10793-da6a-4bfe-b35a-c00a64ac61bc} + {c2a2356e-0e9e-4804-a4b1-d60449f2911e} h;hpp;hxx;hm;inl - {6452d330-e63a-473c-bd9f-1874d4061592} + {279a0045-e0b3-43ce-b511-e6f2e0f43a80} - {fc799aa8-add1-4e83-8dff-de647477bf79} + {723fb507-c0d4-4c49-bb1e-644e479d13d2} @@ -23,6 +23,9 @@ Source Files + + Source Files + Source Files @@ -179,6 +182,9 @@ Source Files + + Source Files + Source Files @@ -230,6 +236,9 @@ Source Files + + Source Files + Source Files @@ -296,6 +305,9 @@ Source Files + + Source Files + Source Files @@ -311,18 +323,6 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - @@ -535,10 +535,10 @@ Header Files - + Header Files - + Header Files @@ -550,6 +550,9 @@ Header Files + + Header Files + Header Files @@ -559,12 +562,6 @@ Generated Files - - Header Files - - - Header Files - 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 e306108e6..000000000 --- a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcproj +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj index a5ba8aa9c..ffde68bf3 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 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -40,513 +32,160 @@ Win32Proj - + DynamicLibrary v120 MultiByte - true - + DynamicLibrary v120_xp MultiByte - true - + DynamicLibrary v120 MultiByte true - + DynamicLibrary v120_xp MultiByte true - - DynamicLibrary - v120 - MultiByte - - - DynamicLibrary - v120_xp - MultiByte - DynamicLibrary v120 MultiByte - + DynamicLibrary - v120_xp + v120 MultiByte + true - - - - - - - + + + - + + + - + + + - + + + + + - + + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false + <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - false - - + - Disabled - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreadedDebug - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - + 4.2 $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb Windows - MachineX86 - true - true - false - false - Default $(IntDir)$(ProjectName).bsc - + - Disabled - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - + 4.2 $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb Windows - MachineX86 - true - true - false - false - Default $(IntDir)$(ProjectName).bsc - + + + X64 + - Disabled - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb Windows - true - true - false - false - Default $(IntDir)$(ProjectName).bsc - + Disabled - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true - - - ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - - $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb - Windows - true - true - false - false - Default - - - $(IntDir)$(ProjectName).bsc - - - - - Full - true - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - MultiThreaded - true - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - Speed - AnySuitable - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb Windows - true - true - MachineX86 - true - true $(IntDir)$(ProjectName).bsc - + - Full - true - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - Speed - AnySuitable - true - true - NoExtensions - true - true - All - true - - - ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - - $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb - Windows - true - true - MachineX86 - true - true - - - $(IntDir)$(ProjectName).bsc - - - - - Full - true - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - Speed - AnySuitable - true - true - StreamingSIMDExtensions2 - true - true - All - true + Disabled + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb Windows - true - true - true - true $(IntDir)$(ProjectName).bsc - + + + X64 + - Full - true - ..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - SYS_WINNT;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - NotUsing - serialpps-ppsapi-provider.h - $(IntDir) - $(OutDir)loopback-ppsapi-provider-vc90 - true - Level3 - ProgramDatabase - CompileAsC - Speed - AnySuitable - true - true - NoExtensions - true - true - All - true + Disabled + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) ntpd.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - - $(OutDir);%(AdditionalLibraryDirectories) - ..\..\ppsapi\loopback\src\loopback-ppsapi.def - true - $(OutDir)$(ProjectName).pdb Windows - true - true - true - true $(IntDir)$(ProjectName).bsc @@ -568,6 +207,7 @@ + @@ -575,7 +215,32 @@ - + + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P loopback-ppsapi + + ..\..\scripts\mkver.bat -P loopback-ppsapi + + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P loopback-ppsapi + + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P loopback-ppsapi + + ..\..\scripts\mkver.bat -P loopback-ppsapi + + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P loopback-ppsapi + + .\version.c;%(Outputs) + 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 135f4eb7e..2b720fa95 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 @@ Source Files + + Source Files + @@ -31,6 +34,6 @@ - + \ 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 6bf76fe93..000000000 --- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcproj +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj index 21a2675c3..d70c18156 100644 --- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj +++ b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -39,41 +31,25 @@ ntp-keygen - - Application - v120 - false - MultiByte - - - Application - v120_xp - false - MultiByte - - + Application v120 false MultiByte - + Application v120_xp false MultiByte - + Application v120 - false - MultiByte - + Application v120_xp - false - MultiByte Application @@ -81,478 +57,123 @@ false MultiByte - + Application - v120_xp - false - MultiByte + v120 - - - - - - - - - + - + + - + - + + - + - + + - + - + + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false + <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - + $(IntDir)ntp-keygen.tlb - Disabled - false - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - true - MultiThreadedDebug - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - All - true + ..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntp-keygen.tlb - Disabled - false - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntp-keygen.tlb - - + - Disabled - false - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - All - true + ..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntp-keygen.tlb - Disabled - false - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntp-keygen.tlb - - - - Full - AnySuitable - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - MultiThreaded - true - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - MachineX86 - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntp-keygen.tlb - - - - - Full - AnySuitable - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - NoExtensions - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - - MachineX86 - true - true - true - true true @@ -561,126 +182,40 @@ + X64 $(IntDir)ntp-keygen.tlb - - + - Full - AnySuitable - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntp-keygen.tlb - - + - Full - AnySuitable - $(VC_IncludePath);..\..\ntp-keygen;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntp-keygen.pch - $(IntDir) - $(IntDir) - $(OutDir)ntp-keygen-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - NoExtensions - true - true - All - true + ..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true @@ -688,16 +223,7 @@ - - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - + @@ -706,38 +232,30 @@ - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntp-keygen + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) + .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters index 4fba55170..b833f2394 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 @@ - {f11f7756-c1fa-4353-8941-89cc81be5e02} + {5e68f697-629e-4dbe-be3f-5ad6c0ea94ec} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {e01d2f25-84af-473d-bb5a-57991927813b} + {d6b533d8-5922-4260-b313-6e47b12171e5} h;hpp;hxx;hm;inl - {8fcd5bab-1f17-4bd9-93a5-33c7eac5b745} + {69c2d8e9-6b31-40b6-bdc8-69e5d5b5d8fd} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/ports/winnt/vs2013/ntp.sln b/ports/winnt/vs2013/ntp.sln index e28828f37..c81fe95a3 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 9a309d24e..000000000 --- a/ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcproj +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 979ceb1ed..01f006cd8 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 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -35,40 +27,27 @@ + keyword-gen {1B814CC1-EAD4-4A13-B29C-A67B23C9845A} ntpdkeywordgen - - Application - v120 - MultiByte - true - - - Application - v120_xp - MultiByte - true - - + Application v120 MultiByte - true - + Application v120_xp MultiByte - true - + Application v120 MultiByte - + Application v120_xp MultiByte @@ -78,422 +57,139 @@ v120 MultiByte - + Application - v120_xp + v120 MultiByte - - - - - - - + + + - + + + - + + + - + + + + + - + + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - - - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - - - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false - - - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false + <_ProjectFileVersion>12.0.30501.0 - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false + $(TmpBaseDir)\ - - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false + + $(TmpBaseDir)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false + $(TmpBaseDir)\ - - $(SolutionDir)$(Platform)-tmp\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - false + + $(TmpBaseDir)\ - - - Disabled - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - true - MultiThreadedDebug - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - Disabled - true - All - true - - - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - false - MachineX86 - true - true - false - false - Default - - - $(IntDir)$(ProjectName).bsc - - - - - Disabled - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - CompileAsC - NoExtensions - true - Disabled - true - true - All - true - - - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - false - MachineX86 - true - true - false - false - Default - - - $(IntDir)$(ProjectName).bsc - - - + + $(TmpBaseDir)\ + + + $(TmpBaseDir)\ + + - Disabled - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - Disabled - false - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - false - true - true - false - false - Default + Console $(IntDir)$(ProjectName).bsc - + - Disabled - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - CompileAsC - NoExtensions - true - Disabled - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - false - true - true - false - false - Default + Console $(IntDir)$(ProjectName).bsc - + + + X64 + - Full - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - MultiThreaded - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - Speed - AnySuitable - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - true - true - MachineX86 - true - true + Console $(IntDir)$(ProjectName).bsc - + - Full - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - Speed - AnySuitable - true - true - NoExtensions - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - true - true - MachineX86 - true - true + Console $(IntDir)$(ProjectName).bsc - + - Full - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - Speed - AnySuitable - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - true - true - true - true + Console $(IntDir)$(ProjectName).bsc - + + + X64 + - Full - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\libopts;%(AdditionalIncludeDirectories) - _CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(OutDir)keyword-gen-vc90 - true - Level4 - ProgramDatabase - Speed - AnySuitable - true - true - NoExtensions - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) $(OutDir)keyword-gen.exe - - - true - $(OutDir)keywordgen.pdb - true - true - true - true + Console $(IntDir)$(ProjectName).bsc @@ -503,21 +199,21 @@ - - - + - - + + + + diff --git a/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat b/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat index 3013b8f15..4d4f92884 100644 --- a/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat +++ b/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat @@ -4,9 +4,9 @@ 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 +if "x%1"=="x" goto Usage +if not exist "%1\keyword-gen.exe" goto ExeNotFound +"%1\keyword-gen.exe" ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h 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 set meat_changed=0 @@ -14,13 +14,15 @@ 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 +copy /y /v new_keyword.h ..\..\..\..\ntpd\ntp_keyword.h findstr diff_ignore_line new_keyword.h > ..\..\..\..\ntpd\keyword-gen-utd echo updated keyword-gen-utd and ntp_keyword.h goto SkipSkipMsg :skipUpdate echo ntp_keyword.h is unchanged +REM 'touch' the file by replacing it with a concatenation of itself and NUL: +copy /b ..\..\..\..\ntpd\ntp_keyword.h+NUL: ..\..\..\..\ntpd\ntp_keyword.h :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 3dfcfe4aa..000000000 --- a/ports/winnt/vs2013/ntpd/ntpd.vcproj +++ /dev/null @@ -1,1126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj b/ports/winnt/vs2013/ntpd/ntpd.vcxproj index 50c9cd989..24bd6cb7a 100644 --- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj +++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -45,41 +37,34 @@ MultiByte true - + Application v120_xp false MultiByte true - + Application v120 false MultiByte true - + Application v120_xp false MultiByte true - + Application v120 false MultiByte true - - Application - v120_xp - false - MultiByte - true - Application v120 @@ -87,107 +72,42 @@ MultiByte true - - Application - v120_xp - false - MultiByte - true - - + + - + - - - - - - - - - + + - + + - + - + + - + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false + <_ProjectFileVersion>12.0.30501.0 @@ -195,246 +115,37 @@ - Full - AnySuitable - true - Speed - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - MultiThreaded - false - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb + winmm.lib;%(AdditionalDependencies) Console - UseLinkTimeCodeGeneration - false - true - MachineX86 - true - true - true - true true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpd.tlb - Full - AnySuitable - true - Speed - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - false - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - true - NoExtensions - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb + winmm.lib;%(AdditionalDependencies) Console - UseLinkTimeCodeGeneration - false - true - MachineX86 - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpd.tlb - - - - - Full - AnySuitable - true - Speed - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - false - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - true - StreamingSIMDExtensions2 - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - true - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpd.tlb - - - - - Full - AnySuitable - true - Speed - true - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - false - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - true - NoExtensions - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - true - true - true - true - true true @@ -447,249 +158,81 @@ - Disabled - Disabled - false - Neither - false - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - true - MultiThreadedDebug - true - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb + winmm.lib;%(AdditionalDependencies) Console - Default - false - true - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpd.tlb - Disabled - Disabled - false - Neither - false - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - true - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;winmm.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb + winmm.lib;%(AdditionalDependencies) Console - Default - false - true - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntpd.tlb - - + - Disabled - Disabled - false - Neither - false - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - true - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - false - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb + winmm.lib;%(AdditionalDependencies) Console - Default - false - true - true - true - false - false true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntpd.tlb - - + - Disabled - Disabled - false - Neither - false - $(VC_IncludePath);..\..\ntpd;..\..\..\..\ntpd;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - true - MultiThreadedDebug - true - $(IntDir)ntpd.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpd-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - true - All - true + ..\..\ntpd;..\..\..\..\ntpd;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;winmm.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb + winmm.lib;%(AdditionalDependencies) Console - Default - false - true - true - true - false - false true @@ -697,24 +240,35 @@ + + + + + + + + + + + + + + + + + + + + - - true - true - true - true - true - true - true - true - - + + + - @@ -728,17 +282,6 @@ - - - - - - true - true - true - true - - @@ -780,137 +323,22 @@ - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpd - - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - + + + + + - - - - - - - - - - - - - - - - + + @@ -921,104 +349,143 @@ - - - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - .\gen-ntp_keyword $(SolutionDir)$(Platform)-tmp\$(Configuration) - - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h ..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - - - - - + + + + + + + + + + + - - - - + + + + invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h + invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h + .\gen-ntp_keyword $(TmpBaseDir) + + .\gen-ntp_keyword $(TmpBaseDir) + + ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h + .\gen-ntp_keyword $(TmpBaseDir) + + ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h + invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h + .\gen-ntp_keyword $(TmpBaseDir) + + .\gen-ntp_keyword $(TmpBaseDir) + + ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h + .\gen-ntp_keyword $(TmpBaseDir) + + ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + + + - + + + + + + + + - - - - + + + + + + + + + - - - - - - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - ..\libntp;%(AdditionalIncludeDirectories) - + + + + + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) + + ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + .\version.c;%(Outputs) + + + + true + true + true + true + true + true + + diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters index c125d105b..e6c43e801 100644 --- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters +++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters @@ -2,34 +2,31 @@ - {31ad5712-dbda-49a0-abf3-c24f1d3b3822} + {2cbfaff6-f124-4847-a42e-8fcda8f2ccde} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {e8591cc7-e9b7-4fea-9747-d219a1ce73cf} + {7c80ca48-41d3-4140-9f66-d1f9b0819935} h;hpp;hxx;hm;inl - {952e91f9-804e-48f6-b49b-6b47ef88bfcb} + {ee743a49-b45f-4111-99c1-b763c58855eb} - {12a98ad7-139f-4258-8886-ed369f10cae6} + {b8223a11-17dc-43a1-8a4d-71cb38696349} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - {ca4a4827-79af-4bbf-abbb-58d6e6e6fdc3} + {42cb2adf-a7f2-44fa-bac2-4e7123023aab} - {5afb644e-b0fd-4fcb-96a3-2bac7c09a7cd} + {46c3cccd-994c-4611-982a-cc7e02e0bb60} Source Files - - Source Files - Source Files @@ -103,7 +100,7 @@ Source Files - Generated Files + Source Files Reference Clock @@ -288,24 +285,10 @@ Parse Lib - - Parse Lib - - - Parse Lib - Parse Lib - - - Generated Files - - - Resource Files - - Header Files @@ -409,6 +392,9 @@ Header Files + + Header Files + Header Files @@ -427,9 +413,6 @@ Header Files - - Header Files - Header Files @@ -545,10 +528,15 @@ - - Source Files - - + + Generated Files + + + Resource Files + + + + Header Files diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcproj b/ports/winnt/vs2013/ntpdate/ntpdate.vcproj deleted file mode 100644 index 85a4bef37..000000000 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcproj +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj index 5591fb7ae..98f84a935 100644 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj +++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -38,37 +30,25 @@ {2789A62E-3F46-44F1-AAF0-816CD23C2911} - - Application - v120 - false - MultiByte - - - Application - v120_xp - false - MultiByte - - + Application v120 false MultiByte - + Application v120_xp false MultiByte - + Application v120 false MultiByte - + Application v120_xp false @@ -80,474 +60,125 @@ false MultiByte - + Application - v120_xp + v120 false MultiByte - - - - - - - - - + - + + - + - + + - + - + + - + - + + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false + <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - + $(IntDir)ntpdate.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - All - true + ..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpdate.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpdate.tlb - - + - Disabled - false - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - All - true + ..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpdate.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - Default - false - - - true - true - false - false - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpdate.tlb - - - - Full - AnySuitable - true - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - MultiThreaded - true - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - StreamingSIMDExtensions2 - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - MachineX86 - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpdate.tlb - - - - - Full - AnySuitable - true - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - NoExtensions - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - MachineX86 - true - true - true - true true @@ -556,126 +187,40 @@ + X64 $(IntDir)ntpdate.tlb - - + - Full - AnySuitable - true - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntpdate.tlb - - + - Full - AnySuitable - true - $(VC_IncludePath);..\..\ntpdate;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpdate.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdate-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - NoExtensions - true - true - All - true + ..\..\ntpdate;..\..\..\..\ntpdate;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true @@ -687,8 +232,6 @@ - - @@ -700,42 +243,36 @@ + + - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdate + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) + .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters index b2ec7e632..e52c61346 100644 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters +++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters @@ -2,15 +2,15 @@ - {a889d71b-7d63-4e86-a764-a4075ede9e24} + {a9c05e13-5296-4958-8c8a-bbaeb940ba64} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {66b7a61f-7329-4b83-8b39-a15703b336bd} + {6cb269b2-f6e6-4efe-ad40-385f8d6e4d1f} h;hpp;hxx;hm;inl - {7acd1484-cc13-4187-a393-39ea3cb89649} + {592dc90e-8075-4d56-b888-2ba3eaa2030e} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcproj b/ports/winnt/vs2013/ntpdc/ntpdc.vcproj deleted file mode 100644 index 5fd301ddf..000000000 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcproj +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj index a16ab0551..54c02538d 100644 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj +++ b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -38,37 +30,25 @@ {8011C820-B3D5-4034-86EA-FFC30AE6764B} - - Application - v120 - false - MultiByte - - - Application - v120_xp - false - MultiByte - - + Application v120 false MultiByte - + Application v120_xp false MultiByte - + Application v120 false MultiByte - + Application v120_xp false @@ -80,474 +60,125 @@ false MultiByte - + Application - v120_xp + v120 false MultiByte - - - - - - - - - + - + + - + - + + - + - + + - + - + + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false + <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - + $(IntDir)ntpdc.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - All - true + ..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpdc.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpdc.tlb - - + - Disabled - false - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - All - true + ..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpdc.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpdc.tlb - - - - Full - AnySuitable - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - MultiThreaded - true - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - MachineX86 - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpdc.tlb - - - - - Full - AnySuitable - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - NoExtensions - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - - MachineX86 - true - true - true - true true @@ -556,126 +187,40 @@ + X64 $(IntDir)ntpdc.tlb - - + - Full - AnySuitable - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntpdc.tlb - - + - Full - AnySuitable - $(VC_IncludePath);..\..\ntpdc;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpdc.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpdc-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - NoExtensions - true - true - All - true + ..\..\ntpdc;..\..\..\..\ntpdc;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true @@ -683,36 +228,9 @@ - - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - - - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - - - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - Level3 - + + + @@ -722,38 +240,30 @@ - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpdc + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) + .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters index 8e83e7631..11295ace7 100644 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters +++ b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters @@ -2,15 +2,15 @@ - {f9cafbdf-2c38-46c2-9c83-4e177c213fd8} + {d89987d8-7f2b-44ac-8fde-655708f3caa4} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {5fa1d807-8b78-4e72-b44c-d698dd579a13} + {5eefdf30-92a6-4318-80fb-dc80ee3091da} h;hpp;hxx;hm;inl - {4c7e2cb5-4dc3-4551-b0a2-11b30ecd802c} + {89efa9a7-ae12-44f9-b06a-197aee209dba} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcproj b/ports/winnt/vs2013/ntpq/ntpq.vcproj deleted file mode 100644 index 440b38bae..000000000 --- a/ports/winnt/vs2013/ntpq/ntpq.vcproj +++ /dev/null @@ -1,357 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcxproj b/ports/winnt/vs2013/ntpq/ntpq.vcxproj index e5f1f8430..da96c405c 100644 --- a/ports/winnt/vs2013/ntpq/ntpq.vcxproj +++ b/ports/winnt/vs2013/ntpq/ntpq.vcxproj @@ -1,14 +1,10 @@  - - Debug XP + + DebugXP Win32 - - Debug XP - x64 - Debug Win32 @@ -17,14 +13,10 @@ Debug x64 - - Release XP + + ReleaseXP Win32 - - Release XP - x64 - Release Win32 @@ -44,142 +36,72 @@ false MultiByte - + Application v120_xp false MultiByte - + Application v120 false MultiByte - + Application v120_xp false MultiByte - + Application v120 false MultiByte - - Application - v120_xp - false - MultiByte - Application v120 false MultiByte - - Application - v120_xp - false - MultiByte - - + + - + - - - - - - - - - + + - + + - + - + + - + - + + - + - + + - <_ProjectFileVersion>12.0.21005.1 - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false - - - $(SolutionDir)$(Platform)-bin\$(Configuration)\ - $(SolutionDir)$(Platform)-tmp\$(Configuration)\$(TargetName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath) - false - false + <_ProjectFileVersion>12.0.30501.0 @@ -187,249 +109,35 @@ - Full - AnySuitable - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - MultiThreaded - true - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - MachineX86 - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpq.tlb - - - - - Full - AnySuitable - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - NoExtensions - true - true - All - true + ..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - MachineX86 - true - true - true - true true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpq.tlb - Full - AnySuitable - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - StreamingSIMDExtensions2 - true - true - All - true + ..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true - - - true - $(IntDir)$(ProjectName).bsc - - - - - $(IntDir)ntpq.tlb - - - - - Full - AnySuitable - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL64_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - MultiThreaded - true - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - true - Speed - true - true - true - NoExtensions - true - true - All - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb - Console - UseLinkTimeCodeGeneration - false - - - true - true - true - true true @@ -442,240 +150,77 @@ - Disabled - false - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - true - All - true + ..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + $(IntDir)ntpq.tlb - Disabled - false - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - MachineX86 - true - true - false - false true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntpq.tlb - - + - Disabled - false - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - StreamingSIMDExtensions2 - true - true - Disabled - false - true - All - true + ..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true $(IntDir)$(ProjectName).bsc - + + X64 $(IntDir)ntpq.tlb - - + - Disabled - false - $(VC_IncludePath);..\..\ntpq;..\..\include;..\..\..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;$(OPENSSL_INC);..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreadedDebug - $(IntDir)ntpq.pch - $(IntDir) - $(IntDir) - $(OutDir)ntpq-vc90 - true - Level4 - true - ProgramDatabase - CompileAsC - NoExtensions - true - true - Disabled - true - true - All - true + ..\..\ntpq;..\..\..\..\ntpq;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) 0x0409 - ws2_32.lib;$(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - - - true - true - $(OutDir)$(ProjectName).pdb Console - Default - false - - - true - true - false - false true @@ -694,38 +239,30 @@ - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq - - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + ..\..\scripts\mkver.bat -P $(ProjectName) - echo Using NT Shell Script to generate version.c -..\..\scripts\mkver.bat -P ntpq + .\version.c;%(Outputs) + .\version.c;%(Outputs) + Using NT Shell Script to generate version.c + ..\..\scripts\mkver.bat -P $(ProjectName) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) - $(ProjectDir)version.c;%(Outputs) + .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters b/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters index 0ac851d64..80276a325 100644 --- a/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters +++ b/ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters @@ -2,15 +2,15 @@ - {726ba7d7-a7f0-4d12-8713-79de7ce8f776} + {8e203dcf-b90d-477e-9cb0-da399ca2eee6} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {e0db3665-e32f-4959-97ac-4cfa2556ef19} + {587344a2-88e1-47c8-9dd7-a7a728ef9a63} h;hpp;hxx;hm;inl - {29c4355d-bb94-4347-964f-5d1c731481d5} + {229bbf9c-4aae-4515-9d9e-4be8dc1f0e04} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/ports/winnt/vs2013/release-x64.props b/ports/winnt/vs2013/release-x64.props new file mode 100644 index 000000000..149182efa --- /dev/null +++ b/ports/winnt/vs2013/release-x64.props @@ -0,0 +1,24 @@ + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + + Full + AnySuitable + true + $(OPENSSL64_INC);%(AdditionalIncludeDirectories) + NDEBUG;OPENSSL;%(PreprocessorDefinitions) + MultiThreaded + + + $(OPENSSL64_LIB)\libeay32.lib;%(AdditionalDependencies) + MachineX64 + + + + \ 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 000000000..d32ea70c1 --- /dev/null +++ b/ports/winnt/vs2013/release.props @@ -0,0 +1,25 @@ + + + + + + + <_ProjectFileVersion>12.0.30501.0 + <_PropertySheetDisplayName>release-x86 + + + + Full + AnySuitable + true + $(OPENSSL_INC);%(AdditionalIncludeDirectories) + NDEBUG;OPENSSL;%(PreprocessorDefinitions) + MultiThreaded + + + $(OPENSSL_LIB)\libeay32.lib;%(AdditionalDependencies) + MachineX86 + + + + \ No newline at end of file