Browse Source

* better splitname to support glib-1.1.dll alike names

peter 27 years ago
parent
commit
aa8d7dea4a
2 changed files with 13 additions and 6 deletions
  1. 5 2
      compiler/import.pas
  2. 8 4
      compiler/win_targ.pas

+ 5 - 2
compiler/import.pas

@@ -95,7 +95,7 @@ end;
 constructor timportlist.init(const n : string);
 constructor timportlist.init(const n : string);
 begin
 begin
   inherited init;
   inherited init;
-  dllname:=stringdup(SplitName(n));
+  dllname:=stringdup(n);
   imported_procedures:=new(plinkedlist,init);
   imported_procedures:=new(plinkedlist,init);
 end;
 end;
 
 
@@ -164,7 +164,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.6  1998-10-13 13:10:17  peter
+  Revision 1.7  1998-10-19 15:41:02  peter
+    * better splitname to support glib-1.1.dll alike names
+
+  Revision 1.6  1998/10/13 13:10:17  peter
     * new style for m68k/i386 infos and enums
     * new style for m68k/i386 infos and enums
 
 
   Revision 1.5  1998/10/06 17:16:51  pierre
   Revision 1.5  1998/10/06 17:16:51  pierre

+ 8 - 4
compiler/win_targ.pas

@@ -63,20 +63,21 @@ unit win_targ;
       var
       var
          hp1 : pimportlist;
          hp1 : pimportlist;
          hp2 : pimported_procedure;
          hp2 : pimported_procedure;
-
+         hs  : string;
       begin
       begin
+         hs:=SplitName(module);
          { search for the module }
          { search for the module }
          hp1:=pimportlist(current_module^.imports^.first);
          hp1:=pimportlist(current_module^.imports^.first);
          while assigned(hp1) do
          while assigned(hp1) do
            begin
            begin
-              if module=hp1^.dllname^ then
+              if hs=hp1^.dllname^ then
                 break;
                 break;
               hp1:=pimportlist(hp1^.next);
               hp1:=pimportlist(hp1^.next);
            end;
            end;
          { generate a new item ? }
          { generate a new item ? }
          if not(assigned(hp1)) then
          if not(assigned(hp1)) then
            begin
            begin
-              hp1:=new(pimportlist,init(module));
+              hp1:=new(pimportlist,init(hs));
               current_module^.imports^.concat(hp1);
               current_module^.imports^.concat(hp1);
            end;
            end;
          hp2:=new(pimported_procedure,init(func,name,index));
          hp2:=new(pimported_procedure,init(func,name,index));
@@ -293,7 +294,10 @@ unit win_targ;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.8  1998-09-07 18:33:35  peter
+  Revision 1.9  1998-10-19 15:41:03  peter
+    * better splitname to support glib-1.1.dll alike names
+
+  Revision 1.8  1998/09/07 18:33:35  peter
     + smartlinking for win95 imports
     + smartlinking for win95 imports
 
 
   Revision 1.7  1998/09/03 17:39:06  florian
   Revision 1.7  1998/09/03 17:39:06  florian