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

A few bugfixes

Browse Source
This commit is contained in:
Josh Yelon 2005-11-09 22:09:00 +00:00
parent 89257e7bdc
commit 01251288dc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/makepanda/makepanda.py
View File

@ -979,9 +979,6 @@ def CompileCxxMSVC7(wobj,fullsrc,ipath,opts):
if (opts.count('NOFLOATWARN')): cmd = cmd + ' /wd4244 /wd4305' if (opts.count('NOFLOATWARN')): cmd = cmd + ' /wd4244 /wd4305'
if (opts.count("WITHINPANDA")): cmd = cmd + ' /DWITHIN_PANDA' if (opts.count("WITHINPANDA")): cmd = cmd + ' /DWITHIN_PANDA'
if (opts.count("MSFORSCOPE")==0): cmd = cmd + ' /Zc:forScope' if (opts.count("MSFORSCOPE")==0): cmd = cmd + ' /Zc:forScope'
if (opts.count("USEPTMALLOC2")): cmd = cmd + ' /DUSE_MEMORY_PTMALLOC2'
if (opts.count("USEDLMALLOC")): cmd = cmd + ' /DUSE_MEMORY_DLMALLOC'
if (opts.count("USEMALLOC")): cmd = cmd + ' /DUSE_MEMORY_MALLOC'
optlevel = getoptlevel(opts,OPTIMIZE) optlevel = getoptlevel(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + " /MD /Zi /RTCs /GS" if (optlevel==1): cmd = cmd + " /MD /Zi /RTCs /GS"
if (optlevel==2): cmd = cmd + " /MD /Zi " if (optlevel==2): cmd = cmd + " /MD /Zi "
@ -1005,7 +1002,6 @@ def CompileCxxLINUXA(wobj,fullsrc,ipath,opts):
if (PkgSelected(opts,"FREETYPE")): cmd = cmd + ' -I/usr/include/freetype2' if (PkgSelected(opts,"FREETYPE")): cmd = cmd + ' -I/usr/include/freetype2'
for x in ipath: cmd = cmd + ' -I' + x for x in ipath: cmd = cmd + ' -I' + x
if (opts.count("WITHINPANDA")): cmd = cmd + ' -DWITHIN_PANDA' if (opts.count("WITHINPANDA")): cmd = cmd + ' -DWITHIN_PANDA'
if (opts.count("USEMALLOC")): cmd = cmd + ' -DUSE_MEMORY_MALLOC'
optlevel = getoptlevel(opts,OPTIMIZE) optlevel = getoptlevel(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + " -g" if (optlevel==1): cmd = cmd + " -g"
if (optlevel==2): cmd = cmd + " -O1" if (optlevel==2): cmd = cmd + " -O1"
@ -1698,6 +1694,9 @@ DTOOLDEFAULTS=[
("VC6_STYLE_ALLOCATOR", 'UNDEF', 'UNDEF'), ("VC6_STYLE_ALLOCATOR", 'UNDEF', 'UNDEF'),
("MODERN_STYLE_ALLOCATOR", 'UNDEF', 'UNDEF'), ("MODERN_STYLE_ALLOCATOR", 'UNDEF', 'UNDEF'),
("NO_STYLE_ALLOCATOR", '1', 'UNDEF'), ("NO_STYLE_ALLOCATOR", '1', 'UNDEF'),
("USE_MEMORY_DLMALLOC", '1', 'UNDEF'),
("USE_MEMORY_PTMALLOC", 'UNDEF', 'UNDEF'),
("USE_MEMORY_MALLOC", 'UNDEF', '1'),
("HAVE_ZLIB", 'UNDEF', 'UNDEF'), ("HAVE_ZLIB", 'UNDEF', 'UNDEF'),
("HAVE_PNG", 'UNDEF', 'UNDEF'), ("HAVE_PNG", 'UNDEF', 'UNDEF'),
("HAVE_JPEG", 'UNDEF', 'UNDEF'), ("HAVE_JPEG", 'UNDEF', 'UNDEF'),
@ -1939,11 +1938,9 @@ IPATH=['dtool/src/dtoolbase']
OPTS=['BUILDING_DTOOL', 'NSPR', 'OPT3'] OPTS=['BUILDING_DTOOL', 'NSPR', 'OPT3']
EnqueueCxx(ipath=IPATH, opts=OPTS, src='indent.cxx', obj='dtoolbase_indent.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='indent.cxx', obj='dtoolbase_indent.obj')
if (sys.platform == "win32"): if (sys.platform == "win32"):
OPTS.append("USEDLMALLOC")
EnqueueCxx(ipath=IPATH, opts=OPTS, src='dlmalloc.c', obj='dtoolbase_allocator.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='dlmalloc.c', obj='dtoolbase_allocator.obj')
EnqueueCxx(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.obj')
else: else:
OPTS.append("USEMALLOC")
EnqueueCxx(ipath=IPATH, opts=OPTS, src='null.cxx', obj='dtoolbase_allocator.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='null.cxx', obj='dtoolbase_allocator.obj')
EnqueueCxx(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='dtoolbase.cxx', obj='dtoolbase_dtoolbase.obj')