TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix probs with new ppremake

Browse Source
This commit is contained in:
David Rose 2002-05-23 23:35:44 +00:00
parent 6a358681ed
commit add4e82238
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dtool/Config.pp
View File

@ -267,7 +267,7 @@
#defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]] #defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]]
// Should we try to build the WCR interface? // Should we try to build the WCR interface?
#define HAVE_WCR $[eq $[PLATFORM],Win32] #define HAVE_WCR $[WINDOWS_PLATFORM]
// How about GLX? // How about GLX?
#define GLX_IPATH #define GLX_IPATH
@ -283,7 +283,7 @@
#define HAVE_GLUT #define HAVE_GLUT
// Should we try to build the WGL interface? // 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? // Should we try to build the SGI-specific glxdisplay?
#define HAVE_SGIGL $[eq $[PLATFORM],Irix] #define HAVE_SGIGL $[eq $[PLATFORM],Irix]
@ -313,7 +313,7 @@
// are required? Currently, this requires NSPR. // are required? Currently, this requires NSPR.
#define NET_IPATH #define NET_IPATH
#define NET_LPATH #define NET_LPATH
#if $[eq $[PLATFORM],Win32] #if $[WINDOWS_PLATFORM]
#define NET_LIBS wsock32.lib #define NET_LIBS wsock32.lib
#else #else
#define NET_LIBS #define NET_LIBS
@ -403,7 +403,7 @@
// BOUNDS (BoundsChecker) // BOUNDS (BoundsChecker)
// INTEL (Intel C/C++ compiler) // INTEL (Intel C/C++ compiler)
#if $[eq $[PLATFORM], Win32] #if $[WINDOWS_PLATFORM]
#if $[eq $[USE_COMPILER],] #if $[eq $[USE_COMPILER],]
#define USE_COMPILER MSVC7 #define USE_COMPILER MSVC7
#endif #endif

12
dtool/Package.pp
View File

@ -47,6 +47,18 @@
#endif #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 // Pull in the package-level Config file. This contains a lot of
// configuration variables that the user might want to fine-tune. // configuration variables that the user might want to fine-tune.
#include $[THISDIRPREFIX]Config.pp #include $[THISDIRPREFIX]Config.pp

10
dtool/pptempl/System.pp
View File

@ -36,13 +36,3 @@
#if $[eq $[DEPENDENCY_CACHE_FILENAME],] #if $[eq $[DEPENDENCY_CACHE_FILENAME],]
#define DEPENDENCY_CACHE_FILENAME pp.dep #define DEPENDENCY_CACHE_FILENAME pp.dep
#endif #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]]