diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index 94abd82c68..fe89ae3002 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -193,12 +193,6 @@ $[all_libs $[if $[and $[build_directory],$[build_target]],$[TARGET]],$[COMPONENT_LIBS]] #defer active_libs $[active_local_libs] $[active_component_libs] -// This variable is true if we are building on some flavor of Unix. -#define unix_platform $[ne $[PLATFORM],Win32] - -// This variable is true if we are building on some flavor of Windows. -#define windows_platform $[eq $[PLATFORM],Win32] - // This subroutine will set up the sources variable to reflect the // complete set of sources for this target, and also set the @@ -384,7 +378,7 @@ #if $[ne $[USE_MAYA] $[components $[USE_MAYA],$[COMPONENT_LIBS]],] #set alt_libs $[alt_libs] $[maya_libs] #endif - #if $[unix_platform] + #if $[UNIX_PLATFORM] #set alt_libs $[alt_libs] $[UNIX_SYS_LIBS] $[components $[UNIX_SYS_LIBS],$[COMPONENT_LIBS]] #endif diff --git a/dtool/pptempl/System.pp b/dtool/pptempl/System.pp index eeaa134137..7771645970 100644 --- a/dtool/pptempl/System.pp +++ b/dtool/pptempl/System.pp @@ -35,3 +35,13 @@ #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 Unix. +#define UNIX_PLATFORM $[ne $[PLATFORM],Win32] + +// True if we are building on some flavor of Windows. +#define WINDOWS_PLATFORM $[eq $[PLATFORM],Win32]