mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 19:08:55 -04:00
*** empty log message ***
This commit is contained in:
parent
09c4d6183c
commit
362b10c695
@ -71,8 +71,11 @@
|
|||||||
// not taking advantage of distributed make, because of
|
// not taking advantage of distributed make, because of
|
||||||
// the overhead associated with Cygwin fork() calls.
|
// the overhead associated with Cygwin fork() calls.
|
||||||
//
|
//
|
||||||
|
#if $[eq $[PLATFORM],Win32]
|
||||||
|
#define BUILD_TYPE msvc
|
||||||
|
#else
|
||||||
#define BUILD_TYPE unix
|
#define BUILD_TYPE unix
|
||||||
|
#endif
|
||||||
|
|
||||||
// What is the default install directory for all trees in the Panda
|
// What is the default install directory for all trees in the Panda
|
||||||
// suite? You may also override this for a particular tree by
|
// suite? You may also override this for a particular tree by
|
||||||
@ -81,7 +84,11 @@
|
|||||||
// control your attachment to the trees; in this case, the install
|
// control your attachment to the trees; in this case, the install
|
||||||
// directory for each tree will by default be the root of the tree
|
// directory for each tree will by default be the root of the tree
|
||||||
// itself (although this may be overridden).
|
// itself (although this may be overridden).
|
||||||
|
#if $[eq $[PLATFORM],Win32]
|
||||||
|
#define INSTALL_DIR /pandadir
|
||||||
|
#else
|
||||||
#define INSTALL_DIR /usr/local/panda
|
#define INSTALL_DIR /usr/local/panda
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// What level of compiler optimization/debug symbols should we build?
|
// What level of compiler optimization/debug symbols should we build?
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
#define dlllib dll
|
#define dlllib dll
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include $[DTOOL]/pptempl/compilerSettings.pp
|
#include $[THISDIRPREFIX]compilerSettings.pp
|
||||||
|
|
||||||
#define WARNING_LEVEL_FLAG /W3
|
#define WARNING_LEVEL_FLAG /W3
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
|
|
||||||
#define CFLAGS_SHARED
|
#define CFLAGS_SHARED
|
||||||
|
|
||||||
#include $[DTOOL]/pptempl/compilerSettings.pp
|
#include $[THISDIRPREFIX]compilerSettings.pp
|
||||||
|
|
||||||
#define WARNING_LEVEL_FLAG /W3
|
#define WARNING_LEVEL_FLAG /W3
|
||||||
|
|
||||||
|
@ -36,14 +36,6 @@
|
|||||||
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
|
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
|
||||||
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
|
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
|
||||||
|
|
||||||
// cant use DTOOL_INSTALL since may not be attached
|
|
||||||
// Actually, the above should work, assuming that DTOOL is set
|
|
||||||
// correctly before building, whether we are attached or not. The
|
|
||||||
// following lines incorrectly assume that DTOOL is a sibling of the
|
|
||||||
// current tree.
|
|
||||||
//#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase
|
|
||||||
//#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]
|
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
@ -41,14 +41,6 @@
|
|||||||
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
|
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
|
||||||
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
|
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
|
||||||
|
|
||||||
// cant use DTOOL_INSTALL since may not be attached
|
|
||||||
// Actually, the above should work, assuming that DTOOL is set
|
|
||||||
// correctly before building, whether we are attached or not. The
|
|
||||||
// following lines incorrectly assume that DTOOL is a sibling of the
|
|
||||||
// current tree.
|
|
||||||
//#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase
|
|
||||||
//#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]
|
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
Loading…
x
Reference in New Issue
Block a user