From 846980feaaa8ac3028d3459bd556e6a64251607e Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Wed, 10 Oct 2001 03:09:25 +0000
Subject: [PATCH] include platform sdk dirs in all win32 builds

---
 dtool/Config.pp         | 7 +++++--
 dtool/pptempl/Global.pp | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index b72552fb54..d9aeb10668 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -254,10 +254,13 @@
 // Should we try to build the SGI-specific glxdisplay?
 #define HAVE_SGIGL $[eq $[PLATFORM],Irix]
 
+#define WIN32_PLATFORMSDK_INCPATH /mspsdk/Include
+#define WIN32_PLATFORMSDK_LIBPATH /mspsdk/Lib
+
 // Should we try to build the DirectX interface?  What additional
 // libraries do we need?
-#define DX_IPATH /mspsdk/Include
-#define DX_LPATH /mspsdk/Lib
+#define DX_IPATH $[WIN32_PLATFORMSDK_INCPATH]
+#define DX_LPATH $[WIN32_PLATFORMSDK_LIBPATH]
 #define DX_LIBS \
   dxguid.lib winmm.lib kernel32.lib gdi32.lib comdlg32.lib winspool.lib \
   user32.lib advapi32.lib ddraw.lib d3dim.lib
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 185aa7bbbd..cd382d2916 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -437,6 +437,10 @@
 #defun get_ipath
   #define alt_ipath $[stl_ipath] $[nspr_ipath] $[python_ipath]
   
+  #if $[eq $[PLATFORM],Win32]  
+    // all win32 files need path to latest windows.h and libs, which are in plat-sdk dirs, not the deflt vc ones
+    #set alt_ipath $[WIN32_PLATFORMSDK_INCPATH] $[alt_ipath]
+  #endif  
   #if $[ne $[USE_CRYPTO] $[components $[USE_CRYPTO],$[active_component_libs]],]
     #set alt_ipath $[alt_ipath] $[crypto_ipath]
   #endif
@@ -502,6 +506,9 @@
 #defun get_lpath
   #define alt_lpath $[stl_lpath] $[nspr_lpath] $[python_lpath]
   
+  #if $[eq $[PLATFORM],Win32]  
+    #set alt_lpath $[WIN32_PLATFORMSDK_LIBPATH] $[alt_lpath] 
+  #endif  
   #if $[ne $[USE_CRYPTO] $[components $[USE_CRYPTO],$[active_component_libs] $[transitive_link]],]
     #set alt_lpath $[alt_lpath] $[crypto_lpath]
   #endif