RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows build fixes

This commit is contained in:
David Rose 2002-02-23 00:45:29 +00:00
parent 5bff58b421
commit cd38e2905a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/metalibs/panda/Sources.pp
View File

@ -9,6 +9,7 @@
#define USE_NET yes
#define COMPONENT_LIBS \
pgraph \
pvrpn grutil chan chancfg pstatclient \
char chat collide cull device \
dgraph display gobj graph gsgbase \

5
panda/src/pgraph/Sources.pp
View File

@ -19,8 +19,9 @@
renderState.h renderState.I \
textureAttrib.h textureAttrib.I
// #define INCLUDED_SOURCES
#define SOURCES $[SOURCES] \
#define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
// #define SOURCES $[SOURCES] \
#define INCLUDED_SOURCES \
colorAttrib.cxx \
config_pgraph.cxx \
cycleData.cxx \

4
panda/src/pgraph/renderState.cxx
View File

@ -100,7 +100,7 @@ RenderState::
// We should never have a reflexive entry in this map. If we
// do, something got screwed up elsewhere.
nassertv(other != this);
nassertv(other != (const RenderState *)this);
// Now we're holding a reference count to the other state, as well
// as to the computed result (if any), so neither object will be
@ -281,7 +281,7 @@ compose(const RenderState *other) const {
CPT(RenderState) result = do_compose(this);
((RenderState *)this)->_self_compose = result;
if (result != this) {
if (result != (const RenderState *)this) {
// If the result of compose(this) is something other than this,
// explicitly increment the reference count. We have to be sure
// to decrement it again later, in our destructor.