Przeglądaj źródła

New incbin format.

Brucey 5 lat temu
rodzic
commit
45d0589ebe
3 zmienionych plików z 17 dodań i 2 usunięć
  1. 4 0
      CHANGELOG
  2. 1 1
      bmk_config.bmx
  3. 12 1
      bmk_make.bmx

+ 4 - 0
CHANGELOG

@@ -1,3 +1,7 @@
+## [3.45] - 2020-08-16
+### Changed
+ - New incbin format.
+
 ## [3.44] - 2020-07-31
 ### Added
  - macOS "arm64" build option.

+ 1 - 1
bmk_config.bmx

@@ -10,7 +10,7 @@ Import brl.map
 
 Import "stringbuffer_core.bmx"
 
-Const BMK_VERSION:String = "3.44"
+Const BMK_VERSION:String = "3.45"
 
 Const ALL_SRC_EXTS$="bmx;i;c;m;h;cpp;cxx;mm;hpp;hxx;s;cc;asm;S"
 

+ 12 - 1
bmk_make.bmx

@@ -416,6 +416,9 @@ Type TBuildManager Extends TCallback
 			If defs Then
 				sb.Append(" -ud ").Append(defs)
 			End If
+			If opt_standalone Then
+				sb.Append(" -ib")
+			End If
 		End If
 
 		source.cc_opts :+ cc_opts
@@ -1328,6 +1331,9 @@ Type TBuildManager Extends TCallback
 				If defs Then
 					sb.Append(" -ud ").Append(defs)
 				End If
+				If opt_standalone Then
+					sb.Append(" -ib")
+				End If
 			End If
 	
 			source.bcc_opts = sb.ToString()
@@ -1422,7 +1428,12 @@ Type TBuildManager Extends TCallback
 
 	Method CreateIncBin:TSourceFile(source:TSourceFile, sourcePath:String)
 	
-		Local path:String = StripDir(sourcePath) + opt_configmung +  processor.CPU() + ".incbin.c"
+		Local path:String = StripDir(sourcePath) + opt_configmung +  processor.CPU()
+		If opt_standalone Then
+			path :+ ".incbin.c"
+		Else
+			path :+ ".incbin2.c"
+		End If
 
 		Local ib:TSourceFile = GetSourceFile(path)