From add4e822383f71f605f1a99219424feb64792263 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 23 May 2002 23:35:44 +0000
Subject: [PATCH] fix probs with new ppremake

---
 dtool/Config.pp         |  8 ++++----
 dtool/Package.pp        | 12 ++++++++++++
 dtool/pptempl/System.pp | 10 ----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 093278d128..287f391819 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -267,7 +267,7 @@
 #defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]]
 
 // Should we try to build the WCR interface?
-#define HAVE_WCR $[eq $[PLATFORM],Win32]
+#define HAVE_WCR $[WINDOWS_PLATFORM]
 
 // How about GLX?
 #define GLX_IPATH
@@ -283,7 +283,7 @@
 #define HAVE_GLUT
 
 // Should we try to build the WGL interface?
-#define HAVE_WGL $[eq $[PLATFORM],Win32]
+#define HAVE_WGL $[WINDOWS_PLATFORM]
 
 // Should we try to build the SGI-specific glxdisplay?
 #define HAVE_SGIGL $[eq $[PLATFORM],Irix]
@@ -313,7 +313,7 @@
 // are required?  Currently, this requires NSPR.
 #define NET_IPATH
 #define NET_LPATH
-#if $[eq $[PLATFORM],Win32]
+#if $[WINDOWS_PLATFORM]
   #define NET_LIBS wsock32.lib
 #else
   #define NET_LIBS
@@ -403,7 +403,7 @@
 //    BOUNDS (BoundsChecker)
 //    INTEL  (Intel C/C++ compiler)
 
-#if $[eq $[PLATFORM], Win32]
+#if $[WINDOWS_PLATFORM]
 #if $[eq $[USE_COMPILER],]
   #define USE_COMPILER MSVC7
 #endif    
diff --git a/dtool/Package.pp b/dtool/Package.pp
index 74935fca0c..2649ffb34d 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -47,6 +47,18 @@
 #endif
 
 
+// These variables tell ppremake how to interpret the contents of the
+// PLATFORM variable, and help it to control the effects of functions
+// like $[os] and $[isfullpath].
+
+// True if we are building on some flavor of Windows.
+#define WINDOWS_PLATFORM $[or $[eq $[PLATFORM],Win32],$[eq $[PLATFORM],Cygwin]]
+
+// True if we are building on some flavor of Unix.
+#define UNIX_PLATFORM $[not $[WINDOWS_PLATFORM]]
+
+
+
 // Pull in the package-level Config file.  This contains a lot of
 // configuration variables that the user might want to fine-tune.
 #include $[THISDIRPREFIX]Config.pp
diff --git a/dtool/pptempl/System.pp b/dtool/pptempl/System.pp
index e6ff928042..bc228a96e2 100644
--- a/dtool/pptempl/System.pp
+++ b/dtool/pptempl/System.pp
@@ -36,13 +36,3 @@
 #if $[eq $[DEPENDENCY_CACHE_FILENAME],]
   #define DEPENDENCY_CACHE_FILENAME pp.dep
 #endif
-
-// These variables tell ppremake how to interpret the contents of the
-// PLATFORM variable, and help it to control the effects of functions
-// like $[os] and $[isfullpath].
-
-// True if we are building on some flavor of Windows.
-#define WINDOWS_PLATFORM $[or $[eq $[PLATFORM],Win32]$[eq $[PLATFORM],Cygwin]]
-
-// True if we are building on some flavor of Unix.
-#define UNIX_PLATFORM $[not $[WINDOWS_PLATFORM]]