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

Fixed regression for module build imported file naming.

woollybah 11 жил өмнө
parent
commit
b9c2ad5f58
1 өөрчлөгдсөн 13 нэмэгдсэн , 6 устгасан
  1. 13 6
      ctranslator.bmx

+ 13 - 6
ctranslator.bmx

@@ -2655,13 +2655,20 @@ End Rem
 	End Method
 
 	Method MungImportFromFile:String(mdecl:TModuleDecl)
-		Local dir:String = ExtractDir(mdecl.filepath).ToLower()
-		dir = dir[dir.findLast("/") + 1..]
-		If dir.EndsWith(".mod") Then
-			dir = dir.Replace(".mod", "")
+DebugStop
+		Local result:String
+		If opt_buildtype <> BUILDTYPE_MODULE Then
+			Local dir:String = ExtractDir(mdecl.filepath).ToLower()
+			dir = dir[dir.findLast("/") + 1..]
+			If dir.EndsWith(".mod") Then
+				dir = dir.Replace(".mod", "")
+			End If
+			Local file:String = StripDir(mdecl.filepath).ToLower()
+			result = "_bb_" + dir + "_" + StripExt(file)
+		Else
+			result = "_bb_" + mdecl.ident
 		End If
-		Local file:String = StripDir(mdecl.filepath).ToLower()
-		Local result:String = "_bb_" + dir + "_" + StripExt(file)
+		
 		'remove non-allowed characters
 		result = result.Replace(".", "_").Replace("-", "_")
 		Return result