|
@@ -2084,7 +2084,7 @@ End Rem
|
|
Local modpath:String
|
|
Local modpath:String
|
|
If opt_buildtype = BUILDTYPE_MODULE Then
|
|
If opt_buildtype = BUILDTYPE_MODULE Then
|
|
modpath = opt_modulename + "_" + StripExt(filepath)
|
|
modpath = opt_modulename + "_" + StripExt(filepath)
|
|
- modpath = modpath.ToLower().Replace(".", "_")
|
|
|
|
|
|
+ modpath = modpath.ToLower().Replace(".", "_").Replace("-", "_")
|
|
Else
|
|
Else
|
|
' todo file imports for apps
|
|
' todo file imports for apps
|
|
internalErr
|
|
internalErr
|
|
@@ -2201,12 +2201,12 @@ End Rem
|
|
If dir.EndsWith(".mod") Then
|
|
If dir.EndsWith(".mod") Then
|
|
dir = dir.Replace(".mod", "")
|
|
dir = dir.Replace(".mod", "")
|
|
End If
|
|
End If
|
|
- dir = dir.Replace(".", "_")
|
|
|
|
|
|
+ dir = dir.Replace(".", "_").Replace("-", "_")
|
|
Local file:String = StripDir(opt_filepath).ToLower()
|
|
Local file:String = StripDir(opt_filepath).ToLower()
|
|
app.munged = "bb_" + dir + "_" + StripExt(file)
|
|
app.munged = "bb_" + dir + "_" + StripExt(file)
|
|
End If
|
|
End If
|
|
End If
|
|
End If
|
|
- app.munged = app.munged.Replace(".", "_")
|
|
|
|
|
|
+ app.munged = app.munged.Replace(".", "_").Replace("-", "_")
|
|
End Method
|
|
End Method
|
|
|
|
|
|
' load external cast defs
|
|
' load external cast defs
|
|
@@ -2339,7 +2339,7 @@ End Rem
|
|
ValidateModIdent ident
|
|
ValidateModIdent ident
|
|
Else If opt_buildtype = BUILDTYPE_MODULE Then
|
|
Else If opt_buildtype = BUILDTYPE_MODULE Then
|
|
munged = opt_modulename + "_" + ident
|
|
munged = opt_modulename + "_" + ident
|
|
- munged = munged.ToLower().Replace(".", "_")
|
|
|
|
|
|
+ munged = munged.ToLower().Replace(".", "_").Replace("-", "_")
|
|
End If
|
|
End If
|
|
|
|
|
|
If opt_ismain Then 'And opt_modulename <> "brl.blitz" Then
|
|
If opt_ismain Then 'And opt_modulename <> "brl.blitz" Then
|
|
@@ -2439,7 +2439,7 @@ End Rem
|
|
Err "Module does not match commandline module"
|
|
Err "Module does not match commandline module"
|
|
End If
|
|
End If
|
|
|
|
|
|
- _module.munged = m.Replace(".", "_")
|
|
|
|
|
|
+ _module.munged = m.Replace(".", "_").Replace("-", "_")
|
|
Case "rem"
|
|
Case "rem"
|
|
ParseRemStmt()
|
|
ParseRemStmt()
|
|
Case "nodebug"
|
|
Case "nodebug"
|