mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-02-14 11:08:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix UNKNOWN_ALLOCATOR O4

Browse Source
This commit is contained in:
cxgeorge
2001-11-16 23:52:45 +00:00
parent 1c158b6dd0
commit 3d43383564
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/Config.Win32.pp
View File

@@ -104,8 +104,8 @@
// this indicates OLD_STYLE_ALLOCATOR is NOT used (defined as the empty string)
#define OLD_STYLE_ALLOCATOR
// this is reqd for msvc 7.0 to build (beta-only, havent tested final)
// #define UNKNOWN_ALLOCATOR 1
// this is reqd for msvc 7.0 to build (beta-only, havent tested final). Default on for Opt4, off otherwise
//#define USE_UNKNOWN_ALLOCATOR 1
// can Intel C++ build this directory successfully (if not, change CC to msvc)
#define NOT_INTEL_BUILDABLE false

6
dtool/LocalSetup.pp
View File

@@ -191,7 +191,11 @@ $[cdefine HAVE_RTTI]
$[cdefine GLOBAL_OPERATOR_NEW_EXCEPTIONS]
/* What style STL allocator should we declare? */
$[cdefine UNKNOWN_ALLOCATOR]
// Use this to force UNKNOWN_ALLOCATOR for non-Opt4 (it is already default for Opt4 using /DUNKNOWN_ALLOCATOR)
// see dtoolbase.h
$[cdefine USE_UNKNOWN_ALLOCATOR]
$[cdefine OLD_STYLE_ALLOCATOR]
$[cdefine GNU_STYLE_ALLOCATOR]

4
dtool/src/dtoolbase/dtoolbase.h
View File

@@ -58,6 +58,10 @@
#endif /* WIN32_VC */
#if defined(USE_UNKNOWN_ALLOCATOR) && !defined(UNKNOWN_ALLOCATOR)
#define UNKNOWN_ALLOCATOR 1
#endif
#include "dtoolsymbols.h"
#ifdef HAVE_MALLOC_H