Bladeren bron

Fix for excessive blank lines from ld on MinGW.

woollybah 10 jaren geleden
bovenliggende
commit
f9f7459e39
1 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 6 6
      bmk_util.bmx

+ 6 - 6
bmk_util.bmx

@@ -349,12 +349,12 @@ Function LinkApp( path$,lnk_files:TList,makelib,opts$ )
 			cmd:+" "+def
 			cmd:+" "+def
 			cmd:+" --out-implib "+imp
 			cmd:+" --out-implib "+imp
 			If usingLD Then
 			If usingLD Then
-				files:+"~n"+CQuote( RealPath(processor.Option("path_to_mingw_lib", processor.MinGWDLLCrtPath()) + "/dllcrt2.o" ) )
+				files:+" "+CQuote( RealPath(processor.Option("path_to_mingw_lib", processor.MinGWDLLCrtPath()) + "/dllcrt2.o" ) )
 			End If
 			End If
 		Else
 		Else
 			If usingLD
 			If usingLD
-				files:+"~n"+CQuote( RealPath(processor.Option("path_to_mingw_lib2", processor.MinGWCrtPath()) + "/crtbegin.o" ) )
-				files:+"~n"+CQuote( RealPath(processor.Option("path_to_mingw_lib", processor.MinGWDLLCrtPath()) + "/crt2.o" ) )
+				files:+" "+CQuote( RealPath(processor.Option("path_to_mingw_lib2", processor.MinGWCrtPath()) + "/crtbegin.o" ) )
+				files:+" "+CQuote( RealPath(processor.Option("path_to_mingw_lib", processor.MinGWDLLCrtPath()) + "/crt2.o" ) )
 			End If
 			End If
 		EndIf
 		EndIf
 	
 	
@@ -367,15 +367,15 @@ Function LinkApp( path$,lnk_files:TList,makelib,opts$ )
 				If f.EndsWith( "/win32maxguiex.mod/xpmanifest.o" )
 				If f.EndsWith( "/win32maxguiex.mod/xpmanifest.o" )
 					xpmanifest=t
 					xpmanifest=t
 				Else
 				Else
-					files:+"~n"+t
+					files:+" "+t
 				EndIf
 				EndIf
 			EndIf
 			EndIf
 		Next
 		Next
-		If xpmanifest files:+"~n"+xpmanifest
+		If xpmanifest files:+" "+xpmanifest
 		
 		
 		cmd:+" "+CQuote( tmpfile )
 		cmd:+" "+CQuote( tmpfile )
 	
 	
-		files:+"~n-lgdi32 -lwsock32 -lwinmm -ladvapi32"
+		files:+" -lgdi32 -lwsock32 -lwinmm -ladvapi32"
 
 
 		' add any user-defined linker options
 		' add any user-defined linker options
 		files:+ " " + opts
 		files:+ " " + opts