From: Dave Hart Date: Sun, 6 Sep 2009 08:38:28 +0000 (+0000) Subject: [Bug 1294] change vs2008 include search path for OpenSSL from X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f993df908f93ed89e71d400a5aa02877b8935a6;p=thirdparty%2Fntp.git [Bug 1294] change vs2008 include search path for OpenSSL from $(OPENSSL)\inc32,$(OPENSSL)\include to $(OPENSSL_INC) to match vc6, vs2003, and vs2005 changes from Danny bk: 4aa37504wiUU7RqMHY5DTKeCxF_rpA --- diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj index b2dad008e5..59b013cf92 100644 --- a/ports/winnt/vs2008/libntp/libntp.vcproj +++ b/ports/winnt/vs2008/libntp/libntp.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,$(OPENSSL)\include,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -124,7 +124,7 @@ Optimization="2" InlineFunctionExpansion="1" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,$(OPENSSL)\include,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H" GeneratePreprocessedFile="0" StringPooling="true" diff --git a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj index 031be432a1..d79acc1526 100644 --- a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj +++ b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj @@ -47,7 +47,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" ExceptionHandling="0" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" diff --git a/ports/winnt/vs2008/ntpd/ntpd.vcproj b/ports/winnt/vs2008/ntpd/ntpd.vcproj index 79b31a6663..3f1585eb0b 100644 --- a/ports/winnt/vs2008/ntpd/ntpd.vcproj +++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj @@ -50,7 +50,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,$(OPENSSL)\inc32,$(OPENSSL)\include,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" StringPooling="true" ExceptionHandling="0" @@ -154,7 +154,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H" MinimalRebuild="true" ExceptionHandling="0" diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj index 9c1587179f..bc52e61c6a 100644 --- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj +++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32" + AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,$(OPENSSL_INC)" PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -145,7 +145,7 @@ Optimization="2" InlineFunctionExpansion="1" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32" + AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,$(OPENSSL_INC)" PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" diff --git a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj index 79cd7aefd9..87a4d1eecb 100644 --- a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj +++ b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -144,7 +144,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" diff --git a/ports/winnt/vs2008/ntpq/ntpq.vcproj b/ports/winnt/vs2008/ntpq/ntpq.vcproj index 71a251a03c..828009ea0a 100644 --- a/ports/winnt/vs2008/ntpq/ntpq.vcproj +++ b/ports/winnt/vs2008/ntpq/ntpq.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -143,7 +143,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\..\libopts" + AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,,$(OPENSSL_INC),..\..\..\..\libopts" PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3"