Merge branch 'fix-shared-libraries-for-windows' into 'master'

Improve handling of import code from library

See merge request !26

Pm/PmDriver.icl

@@ -942,11 +942,15 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
 								= GetPathNames /*abcLinkInfo.*/linkObjFileNames ofiles` srcpaths abcPathsCache ps
 	# (shared_libraries,library_files)
 								= IF_WINDOWS
-									(Nil, libs)
-									( [|l \\ (_,l) <|- libs | isSharedLibrary l]
-									, Filter (\(_,l) -> not (isSharedLibrary l)) libs
+									( [|]
+									, [|l \\ l=:(_,name) <|- libs | not (isSharedLibrary name)]
 									)
-								with isSharedLibrary l = size l >= 2 && l.[0]=='-' && l.[1]=='l'
+									( [|name \\ (_,name) <|- libs | isSharedLibrary name]
+									, [|l \\ l=:(_,name) <|- libs | not (isSharedLibrary name) && has_dot (size name-1) name]
+									)
+								with
+									isSharedLibrary l = size l >= 2 && l.[0]=='-' && l.[1]=='l'
+									has_dot i l = if (i<0) False (l.[i]=='.' || has_dot (i-1) l)
 	# (libPathsOk,lfiles,abcPathsCache, ps)
 								= GetPathNames library_files lfiles srcpaths abcPathsCache ps
 	| not objPathsOk