Browse Source

Added support for direct import of .a files.

woollybah 9 năm trước cách đây
mục cha
commit
d8cf2ba3be
3 tập tin đã thay đổi với 3 bổ sung3 xóa
  1. 1 0
      bmk.bmx
  2. 1 1
      bmk_config.bmx
  3. 1 2
      bmk_make.bmx

+ 1 - 0
bmk.bmx

@@ -1,5 +1,6 @@
 '
 ' Change History :
+' 3.16 31/07/2016 - Added support for direct import of .a files.
 ' 3.15 16/07/2016 - Linux build additions. Support for musl libc and static linking.
 '                   Fixed Win32 32-bit link issue on recent 64-bit MinGW.
 ' 3.14 05/06/2016 - Can now set command-line options via custom.bmk.

+ 1 - 1
bmk_config.bmx

@@ -6,7 +6,7 @@ Import BRL.StandardIO
 ?macos
 Import Pub.MacOS
 ?
-Const BMK_VERSION:String = "3.15"
+Const BMK_VERSION:String = "3.16"
 
 Const ALL_SRC_EXTS$="bmx;i;c;m;h;cpp;cxx;mm;hpp;hxx;s;cc"
 

+ 1 - 2
bmk_make.bmx

@@ -782,7 +782,7 @@ Type TBuildManager
 						
 							source.AddIncludePath(" -I" + CQuote(ExtractDir(path)))
 							
-						Else If Match(ext, "o") Then ' object?
+						Else If Match(ext, "o;a") Then ' object or archive?
 						
 							Local s:TSourceFile = New TSourceFile
 							s.time = FileTime(path)
@@ -799,7 +799,6 @@ Type TBuildManager
 								source.depsList = New TList
 							End If
 							source.depsList.AddLast(s)
-						
 						End If
 						
 					End If