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

vc7.1 fixes

Browse Source
This commit is contained in:
cxgeorge 2002-11-23 03:07:27 +00:00
parent 0bb4baebe7
commit bf732bff8d
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dtool/Config.Win32.pp
View File

@ -109,10 +109,5 @@
// Must global operator new and delete functions throw exceptions? // Must global operator new and delete functions throw exceptions?
#define GLOBAL_OPERATOR_NEW_EXCEPTIONS #define GLOBAL_OPERATOR_NEW_EXCEPTIONS
// What is the syntax of the STL allocator declaration? See
// LocalSetup.pp for allowable values.
//#define STL_ALLOCATOR VC6
#define STL_ALLOCATOR MODERN
// can Intel C++ build this directory successfully (if not, change CC to msvc) // can Intel C++ build this directory successfully (if not, change CC to msvc)
#define NOT_INTEL_BUILDABLE false #define NOT_INTEL_BUILDABLE false

2
dtool/pptempl/Template.gmsvc.pp
View File

@ -636,7 +636,7 @@ $[TAB] cp -f $[ODIR]/$[local] $[dest]
$[output_exe] : $[input_exe] $[output_exe] : $[input_exe]
$[TAB] rm -f $[output_exe] $[TAB] rm -f $[output_exe]
$[TAB] $[bin_postprocess_cmd] $[input_exe] $[bin_postprocess_arg1] $[output_exe] $[TAB] $[bin_postprocess_cmd] $[bin_postprocess_arg1] $[input_exe] $[bin_postprocess_arg2] $[output_exe]
$[install_bin_dir]/$[bin_postprocess_target].exe : $[output_exe] $[install_bin_dir]/$[bin_postprocess_target].exe : $[output_exe]
$[TAB] cp -f $[output_exe] $[install_bin_dir] $[TAB] cp -f $[output_exe] $[install_bin_dir]

11
dtool/pptempl/compilerSettings.pp
View File

@ -44,12 +44,23 @@
// ensure pdbs are copied to install dir // ensure pdbs are copied to install dir
#define build_pdbs yes #define build_pdbs yes
#define STL_ALLOCATOR VC6
#elif $[or $[eq $[USE_COMPILER], MSVC7], $[eq $[USE_COMPILER], MSVC7_1]] #elif $[or $[eq $[USE_COMPILER], MSVC7], $[eq $[USE_COMPILER], MSVC7_1]]
#define COMPILER cl #define COMPILER cl
#define LINKER link #define LINKER link
#define LIBBER lib #define LIBBER lib
#if $[eq $[USE_COMPILER], MSVC7]
// What is the syntax of the STL allocator declaration? See
// LocalSetup.pp for allowable values.
#define STL_ALLOCATOR MODERN
#else
// until I figure out how to get rid of 'rebind' vc7.1 C4346 build errors
#define STL_ALLOCATOR UNKNOWN
#endif
#if $[eq $[NO_CROSSOBJ_OPT],] #if $[eq $[NO_CROSSOBJ_OPT],]
#define DO_CROSSOBJ_OPT 1 #define DO_CROSSOBJ_OPT 1
#endif #endif

5
dtool/src/dtoolbase/dallocator.h
View File

@ -87,8 +87,9 @@ public:
INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0); INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0);
INLINE void deallocate(void *p, size_type n); INLINE void deallocate(void *p, size_type n);
template<class U> template<class U> struct rebind {
struct rebind { typedef dallocator<U> other; }; typedef dallocator<U> other;
};
}; };
#else #else