FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Farshid Lashkari, "I've made a small modification to osgDB::DynamicLibrary so it can load UTF-8 filenames on Windows."

Browse Source
This commit is contained in:
Robert Osfield 2010-06-17 11:03:23 +00:00
parent 5c2abfe062
commit c3b9419e05
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgDB/DynamicLibrary.cpp
View File

@ -43,6 +43,7 @@
#include <osgDB/DynamicLibrary> #include <osgDB/DynamicLibrary>
#include <osgDB/FileUtils> #include <osgDB/FileUtils>
#include <osgDB/FileNameUtils> #include <osgDB/FileNameUtils>
#include <osgDB/ConvertUTF>
using namespace osgDB; using namespace osgDB;
@ -93,7 +94,11 @@ DynamicLibrary::HANDLE DynamicLibrary::getLibraryHandle( const std::string& libr
HANDLE handle = NULL; HANDLE handle = NULL;
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
#ifdef OSG_USE_UTF8_FILENAME
handle = LoadLibraryW( convertUTF8toUTF16(libraryName).c_str() );
#else
handle = LoadLibrary( libraryName.c_str() ); handle = LoadLibrary( libraryName.c_str() );
#endif
#elif defined(__APPLE__) && defined(APPLE_PRE_10_3) #elif defined(__APPLE__) && defined(APPLE_PRE_10_3)
NSObjectFileImage image; NSObjectFileImage image;
// NSModule os_handle = NULL; // NSModule os_handle = NULL;