[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 b2dad008e5479dcfd685a25b02d77e9bf1375d90..59b013cf92dc616247acab8b52bc5f6c069072f1 100644 (file)
--- 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 031be432a14a30b4ca2c402d683678c24c1beb56..d79acc152657511c3ea6e7b07532dd7fe043c54c 100644 (file)
--- 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 79b31a6663064df8b9873a5a3b1a7678cc94caf5..3f1585eb0bb2799b311f3bff7fee66707996cdb3 100644 (file)
--- 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 9c1587179fccc5f6a718d4108f270f5823fb71b2..bc52e61c6afa020d6b8d2c06b9629e477d534c46 100644 (file)
--- 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 79cd7aefd958cc6654da6be0755b74f420427f58..87a4d1eecbf5f4d96a853e6d3e9e3afdaa6007d0 100644 (file)
--- 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 71a251a03c4aaa75fe9a15913817c89a491a6f8d..828009ea0a4088b9c3de60a0297815cd9cad69db 100644 (file)
--- 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"