Show
Ignore:
Timestamp:
11/18/09 13:15:29 (5 years ago)
Author:
robert
Message:

From Mathias Froechlich, "Attached the collected fixes I needed to compile with all of them.
Most notable the hpux define stuff. The hpux variant seems to be not
defined which resulted in a compile error at this time. Consequently I have
replaced all occurances of
hpux with hpux. And huge surprise: now osg
plugins are found and loaded correctly ...
The next notable one is the MSVC_IDE fix which makes the nmake Makefiles cmake
generator target behave like the ide one. Showed up because I started to do
scripted builds with nmake instead of devenv...
The rest is the usual bunch of stuff that just happens during normal
coding ..."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgDB/Registry.cpp

    r10520 r10768  
    719719        return prepend+"osgdb_"+lowercase_ext; 
    720720    #endif 
    721 #elif defined(__hpux__) 
    722     // why don't we use PLUGIN_EXT from the makefiles here? 
    723     return prepend+"osgdb_"+lowercase_ext+".sl"; 
    724721#else 
    725722    #ifdef _DEBUG 
    726          return prepend+"osgdb_"+lowercase_ext+ OSG_DEBUG_POSTFIX_WITH_QUOTES + ".so"; 
     723         return prepend+"osgdb_"+lowercase_ext+ OSG_DEBUG_POSTFIX_WITH_QUOTES + ADDQUOTES(OSG_PLUGIN_EXTENSION); 
    727724    #else 
    728          return prepend+"osgdb_"+lowercase_ext+".so"; 
     725         return prepend+"osgdb_"+lowercase_ext+ADDQUOTES(OSG_PLUGIN_EXTENSION); 
    729726    #endif 
    730727#endif 
     
    750747        return name; 
    751748    #endif 
    752 #elif defined(__hpux__) 
    753     // why don't we use PLUGIN_EXT from the makefiles here? 
    754     return "lib"+name+".sl"; 
    755749#else 
    756750    #ifdef _DEBUG 
    757         return "lib"+name+OSG_DEBUG_POSTFIX_WITH_QUOTES +".so"; 
     751        return "lib"+name+OSG_DEBUG_POSTFIX_WITH_QUOTES + ADDQUOTES(OSG_PLUGIN_EXTENSION); 
    758752    #else 
    759         return "lib"+name+".so"; 
     753        return "lib"+name+ADDQUOTES(OSG_PLUGIN_EXTENSION); 
    760754    #endif 
    761755#endif