Various MSVC patches.
This commit is contained in:
parent
33854d9f6a
commit
535d708ee0
3 changed files with 13 additions and 8 deletions
|
@ -48,7 +48,10 @@
|
|||
#define WIN_W 1024
|
||||
#define WIN_H 768
|
||||
|
||||
#ifdef NONE
|
||||
#ifdef defined( NONE ) && defined( _MSC_VER )
|
||||
# pragma message( "A sloppy coder has defined NONE as a macro!!!" )
|
||||
# undef NONE
|
||||
#elif defined( NONE )
|
||||
# pragma warn A sloppy coder has defined NONE as a macro!!!
|
||||
# undef NONE
|
||||
#endif
|
||||
|
|
|
@ -1515,10 +1515,6 @@ int mainLoop( int argc, char **argv ) {
|
|||
argc = ccommand( &argv );
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_BC5PLUS
|
||||
_control87(MCW_EM, MCW_EM); /* defined in float.h */
|
||||
#endif
|
||||
|
||||
// set default log levels
|
||||
sglog().setLogLevels( SG_ALL, SG_INFO );
|
||||
|
||||
|
@ -1859,11 +1855,15 @@ int mainLoop( int argc, char **argv ) {
|
|||
// Main entry point; catch any exceptions that have made it this far.
|
||||
int main ( int argc, char **argv ) {
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if defined( _MSC_VER ) && defined( DEBUG )
|
||||
// Christian, we should document what this does
|
||||
_control87( _EM_INEXACT, _MCW_EM );
|
||||
#endif
|
||||
|
||||
#if defined( HAVE_BC5PLUS )
|
||||
_control87(MCW_EM, MCW_EM); /* defined in float.h */
|
||||
#endif
|
||||
|
||||
// FIXME: add other, more specific
|
||||
// exceptions.
|
||||
try {
|
||||
|
|
|
@ -342,6 +342,8 @@ void *fgBillboard( ssgBranch *lightmaps, ssgVertexArray *light_maps, ssgSimpleSt
|
|||
leaf->setState( lightmap_state );
|
||||
lightmaps->addKid( leaf );
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ssgBranch* FGTileEntry::gen_runway_lights( ssgVertexArray *points,ssgVertexArray *normal,
|
||||
|
|
Loading…
Reference in a new issue