Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index bf227bbf0eb779675405eaa246a6fe40e344eb3c..c631d06b30a395dce169ad33d3ba98ae40dbf104 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -61,11 +61,11 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
 #if defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
 #if defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
 #elif defined(__WXMAC__) && !defined(__DARWIN__)

-    const wxChar *wxDynamicLibrary::ms_dllext = _T("");
+    const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;

 #endif
 
 #endif
 

-// for Unix it is in src/unix/dlunix.cpp
-#ifndef __UNIX__
+// for MSW/Unix it is defined in platform-specific file
+#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)

 
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {
 
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {


@@ -73,7 +73,8 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
    return 0;
 }
 
    return 0;
 }
 

-#endif // __UNIX__
+#endif // __WXMSW__ || __UNIX__
+

 
 bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 {
 
 bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 {


@@ -119,7 +120,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";

-    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
+    DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);

 #else
     m_handle = RawLoad(libname, flags);
 #endif
 #else
     m_handle = RawLoad(libname, flags);
 #endif


@@ -139,7 +140,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 // for MSW and Unix this is implemented in the platform-specific file
 //
 // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
 // for MSW and Unix this is implemented in the platform-specific file
 //
 // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!

-#if !defined(__WXMSW__) && !defined(__UNIX__)
+#if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__)

 
 /* static */
 void wxDynamicLibrary::Unload(wxDllType handle)
 
 /* static */
 void wxDynamicLibrary::Unload(wxDllType handle)


@@ -176,7 +177,7 @@ void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 #elif defined(__WXPM__) || defined(__EMX__)
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 #elif defined(__WXPM__) || defined(__EMX__)

-    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
+    DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );

 #else
     symbol = RawGetSymbol(m_handle, name);
 #endif
 #else
     symbol = RawGetSymbol(m_handle, name);
 #endif


@@ -215,7 +216,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
     wxString nameCanonic;
 
     // under Unix the library names usually start with "lib" prefix, add it
     wxString nameCanonic;
 
     // under Unix the library names usually start with "lib" prefix, add it

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__EMX__)

     switch ( cat )
     {
         default:
     switch ( cat )
     {
         default:


@@ -263,7 +264,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
         suffix = wxString(_T("_")) + suffix;
 
 #define WXSTRINGIZE(x)  #x
         suffix = wxString(_T("_")) + suffix;
 
 #define WXSTRINGIZE(x)  #x

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__EMX__)

     #if (wxMINOR_VERSION % 2) == 0
         #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
     #else
     #if (wxMINOR_VERSION % 2) == 0
         #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
     #else