[Dotgnu-pnet-commits] CVS: pnet/image link.c,1.20,1.21

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/image
In directory subversions:/tmp/cvs-serv15692/image

Modified Files:
        link.c 
Log Message:


SearchForDllMap: add a temporary hack to recognize Gtk# module references
and remap them to shared objects.


Index: link.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/link.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** link.c      28 Feb 2003 06:57:31 -0000      1.20
--- link.c      3 May 2003 00:06:50 -0000       1.21
***************
*** 824,827 ****
--- 824,858 ----
        int newNameLen;
  
+ #ifndef IL_WIN32_PLATFORM
+       /* Hack around a hard-wired library names in Gtk#.  This is temporary
+          until we can come up with a better solution that does not require
+          the user to manually edit configuration files */
+       if(!strcmp(name, "libgtk-win32-2.0-0.dll"))
+       {
+               *remapName = "libgtk-x11-2.0.so";
+               return strlen(*remapName);
+       }
+       else if(!strcmp(name, "libgobject-2.0-0.dll"))
+       {
+               *remapName = "libgobject-2.0.so";
+               return strlen(*remapName);
+       }
+       else if(!strcmp(name, "libglib-2.0-0.dll"))
+       {
+               *remapName = "libglib-2.0.so";
+               return strlen(*remapName);
+       }
+       else if(!strcmp(name, "libpango-1.0-0.dll"))
+       {
+               *remapName = "libpango-1.0.so";
+               return strlen(*remapName);
+       }
+       else if(!strcmp(name, "libatk-1.0-0.dll"))
+       {
+               *remapName = "libatk-1.0.so";
+               return strlen(*remapName);
+       }
+ #endif
+ 
        attr = 0;
        while((attr = ILProgramItemNextAttribute(item, attr)) != 0)
***************
*** 948,952 ****
                        ++posn;
                }
!               if(!needSuffix)
                {
                        /* Strip ".dll" from the end of the name if present */
--- 979,983 ----
                        ++posn;
                }
!               if(needSuffix)
                {
                        /* Strip ".dll" from the end of the name if present */