Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up about a bazillion compilation warnings.

Browse Source
This commit is contained in:
sjbaker
2006-12-22 02:33:42 +00:00
parent 4685bb8c4b
commit db573e4a59
23 changed files with 854 additions and 4260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.h
View File

@@ -49,4 +49,5 @@ public:
};
#endif //BOX_BOX__COLLISION_ALGORITHM_H
#endif //BOX_BOX__COLLISION_ALGORITHM_H

10
Extras/COLLADA_DOM/src/dae/daeAtomicType.cpp
View File

@@ -406,11 +406,11 @@ daeBool
{
strcpy( dst, "NaN" );
}
else if ( *(daeInt*)src == 0x7f800000 ) //+INF
else if ( *(daeUInt*)src == 0x7f800000 ) //+INF
{
strcpy( dst, "INF" );
}
else if ( *(daeInt*)src == 0xff800000 ) //-INF
else if ( *(daeUInt*)src == 0xff800000 ) //-INF
{
strcpy( dst, "-INF" );
}
@@ -451,11 +451,11 @@ daeBool
{
strcpy( dst, "NaN" );
}
else if ( *(daeLong*)src == 0x7ff0000000000000LL ) //+INF
else if ( *(daeULong*)src == 0x7ff0000000000000LL ) //+INF
{
strcpy( dst, "INF" );
}
else if ( *(daeLong*)src == 0xfff0000000000000LL ) //-INF
else if ( *(daeULong*)src == 0xfff0000000000000LL ) //-INF
{
strcpy( dst, "-INF" );
}
@@ -666,7 +666,7 @@ daeResolverType::stringToMemory(daeChar* src, daeChar* dstMemory)
} else if (*s == ' ') {
char err[512];
memset( err, 0, 512 );
sprintf(err,"uri contains white space, dom will convert them to %20 in output files!\n uri=%s", src);
sprintf(err,"uri contains white space, dom will convert them to %%20 in output files!\n uri=%s", src);
daeErrorHandler::get()->handleWarning( err );
}
*t=*s;

2
Extras/COLLADA_DOM/src/dae/daeIDRef.cpp
View File

@@ -250,7 +250,7 @@ daeDefaultIDRefResolver::resolveElement(daeIDRef& idref, daeString typeNameHint)
if ( idref.getContainer() == NULL )
{
char msg[128];
sprintf(msg,"daeDefaultIDRefResolver::resolveElement() - failed to resolve %s\n",idref.getID(), ". IDRef needs a container element!" );
sprintf(msg,"daeDefaultIDRefResolver::resolveElement() - failed to resolve %s%s\n",idref.getID(), ". IDRef needs a container element!" );
daeErrorHandler::get()->handleWarning( msg );
return false;
}

29
Extras/GPUphysics/Jamfile
View File

@@ -1,22 +1,23 @@
SubDir TOP Extras GPUphysics ;
if $(GLUT.AVAILABLE) = "yes"
{
# All demo apps have a lot in common, so use this rule to simply things
rule GPUDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
# LinkWith $(<) : GLUT ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
;
if $(GLUT.AVAILABLE) = "yes"
{
# All demo apps have a lot in common, so use this rule to simply things
rule GPUDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
# LinkWith $(<) : GLUT ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
;
ExternalLibs GPUphysics : GLUT GLEW ;
}
}
}
GPUDemo GPUphysics : [ Wildcard *.h *.cpp ] ;

2
Extras/Jamfile
View File

@@ -11,4 +11,4 @@ SubInclude TOP Extras GIMPACT ;
SubInclude TOP Extras GIMPACTBullet ;
#GPUphysics needs 'make', not jam compatible build yet:
SubInclude TOP Extras GPUphysics ;
#SubInclude TOP Extras GPUphysics ;

3
Extras/quickstep/OdeSolverBody.h
View File

@@ -44,4 +44,5 @@ struct OdeSolverBody
};
#endif //#ifndef ODE_SOLVER_BODY_H
#endif //#ifndef ODE_SOLVER_BODY_H