Răsfoiți Sursa

* sharedlib is placed in exe outputdir

peter 22 ani în urmă
părinte
comite
5af7a2c7a0
1 a modificat fișierele cu 8 adăugiri și 5 ștergeri
  1. 8 5
      compiler/finput.pas

+ 8 - 5
compiler/finput.pas

@@ -638,15 +638,15 @@ uses
          if AllowOutput and (OutputFile<>'') and (compile_level=1) then
          if AllowOutput and (OutputFile<>'') and (compile_level=1) then
           n:=OutputFile;
           n:=OutputFile;
          staticlibfilename:=stringdup(p+target_info.staticlibprefix+n+target_info.staticlibext);
          staticlibfilename:=stringdup(p+target_info.staticlibprefix+n+target_info.staticlibext);
-         if target_info.system in [system_i386_WIN32,system_i386_wdosx] then
-           sharedlibfilename:=stringdup(p+n+target_info.sharedlibext)
-         else
-           sharedlibfilename:=stringdup(p+target_info.sharedlibprefix+n+target_info.sharedlibext);
          { output dir of exe can be specified separatly }
          { output dir of exe can be specified separatly }
          if AllowOutput and (OutputExeDir<>'') then
          if AllowOutput and (OutputExeDir<>'') then
           p:=OutputExeDir
           p:=OutputExeDir
          else
          else
           p:=path^;
           p:=path^;
+         if target_info.system in [system_i386_WIN32,system_i386_wdosx] then
+           sharedlibfilename:=stringdup(p+n+target_info.sharedlibext)
+         else
+           sharedlibfilename:=stringdup(p+target_info.sharedlibprefix+n+target_info.sharedlibext);
          exefilename:=stringdup(p+n+target_info.exeext);
          exefilename:=stringdup(p+n+target_info.exeext);
          mapfilename:=stringdup(p+n+'.map');
          mapfilename:=stringdup(p+n+'.map');
       end;
       end;
@@ -704,7 +704,10 @@ uses
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.21  2002-12-29 14:57:50  peter
+  Revision 1.22  2003-04-28 16:18:16  peter
+    * sharedlib is placed in exe outputdir
+
+  Revision 1.21  2002/12/29 14:57:50  peter
     * unit loading changed to first register units and load them
     * unit loading changed to first register units and load them
       afterwards. This is needed to support uses xxx in yyy correctly
       afterwards. This is needed to support uses xxx in yyy correctly
     * unit dependency check fixed
     * unit dependency check fixed