2
0
Эх сурвалжийг харах

Incbins in included files generate in main file. Fixes #45.

woollybah 7 жил өмнө
parent
commit
84d4c1a093
2 өөрчлөгдсөн 5 нэмэгдсэн , 1 устгасан
  1. 3 1
      bmk_make.bmx
  2. 2 0
      bmk_modutil.bmx

+ 3 - 1
bmk_make.bmx

@@ -714,7 +714,7 @@ Type TBuildManager Extends TCallback
 			Next
 
 			Local ib:TSourceFile
-			If processor.BCCVersion() <> "BlitzMax" And Not source.incbins.IsEmpty() Then
+			If processor.BCCVersion() <> "BlitzMax" And Not source.isInclude And Not source.incbins.IsEmpty() Then
 				ib = CreateIncBin(source)
 			End If
 
@@ -940,6 +940,8 @@ Type TBuildManager Extends TCallback
 								source.gen_time = FileTime(p)
 							End If
 						End If
+					Else
+						source.isInclude = True
 					End If
 				End If
 			End If

+ 2 - 0
bmk_modutil.bmx

@@ -82,6 +82,8 @@ Type TSourceFile
 	Field maxLinkTimeCache:Int = -1
 	Field maxIfaceTimeCache:Int = -1
 	
+	Field isInclude:Int
+	
 	' add cc_opts or ld_opts
 	Method AddModOpt(opt:String)
 		If Not mod_opts Then