|
@@ -219,13 +219,28 @@ Class BuilderInstance
|
|
|
' fdecl.rfile=module.cfileDir+"r_"+ident+".cpp"
|
|
|
|
|
|
module.fileDecls.Push( fdecl )
|
|
|
-
|
|
|
- For Local imp:=Eachin fdecl.imports
|
|
|
|
|
|
- ImportFile( imp )
|
|
|
+ BuildEx.srcpath=fdecl.path
|
|
|
+ BuildEx.srcpos=-1
|
|
|
+
|
|
|
+ For Local imp:=0 Until fdecl.imports.Length
|
|
|
|
|
|
+ Local path:=fdecl.imports[imp]
|
|
|
+
|
|
|
+ Local i:=path.FindLast( "[" )
|
|
|
+ If i<>-1 And path.EndsWith( "]" )
|
|
|
+ BuildEx.srcpos=Int( path.Slice( i+1,-1 ) )
|
|
|
+ path=path.Slice( 0,i )
|
|
|
+ fdecl.imports[imp]=path
|
|
|
+ Else
|
|
|
+ BuildEx.srcpos=-1
|
|
|
+ Endif
|
|
|
+
|
|
|
+ ImportFile( path )
|
|
|
Next
|
|
|
|
|
|
+ BuildEx.srcpath=""
|
|
|
+
|
|
|
currentDir=cd
|
|
|
|
|
|
Forever
|
|
@@ -594,8 +609,8 @@ Class BuilderInstance
|
|
|
Type.TypeInfoClass.Semant()
|
|
|
End
|
|
|
|
|
|
- Method ImportFile:Void( path:String )
|
|
|
-
|
|
|
+ Method ImportFile( path:String )
|
|
|
+
|
|
|
If path.StartsWith( "<" ) And path.EndsWith( ">" )
|
|
|
ImportSystemFile( path.Slice( 1,-1 ) )
|
|
|
Else
|
|
@@ -744,34 +759,31 @@ Class BuilderInstance
|
|
|
|
|
|
Local qpath:="~q"+path+"~q"
|
|
|
|
|
|
- Select ext
|
|
|
- Case ".framework"
|
|
|
+ If ext=".framework"
|
|
|
|
|
|
If product.toolchain="gcc"
|
|
|
If GetFileType( path )<>FileType.Directory
|
|
|
- New BuildEx( "Framework "+qpath+" not found" )
|
|
|
- Return
|
|
|
+ New BuildEx( "Framework not found "+qpath )
|
|
|
Endif
|
|
|
+
|
|
|
+ Return
|
|
|
Endif
|
|
|
|
|
|
- Default
|
|
|
- Select GetFileType( path )
|
|
|
- Case FileType.Directory
|
|
|
+ Else If GetFileType( path )=FileType.Directory
|
|
|
|
|
|
- product.ASSET_FILES.Push( path )
|
|
|
- Return
|
|
|
-
|
|
|
- Case FileType.None
|
|
|
+ product.ASSET_FILES.Push( path )
|
|
|
+ Return
|
|
|
|
|
|
-' New BuildEx( "File "+qpath+" not found" )
|
|
|
-' Return
|
|
|
-
|
|
|
- End
|
|
|
- End
|
|
|
+ Else If GetFileType( path )<>FileType.File
|
|
|
+
|
|
|
+ New BuildEx( "File not found "+qpath )
|
|
|
+ Return
|
|
|
+
|
|
|
+ Endif
|
|
|
|
|
|
Select ext
|
|
|
Case ".mx2",".monkey2"
|
|
|
-
|
|
|
+
|
|
|
MX2_SRCS.Push( path )
|
|
|
|
|
|
Case ".h",".hh",".hxx",".hpp"
|
|
@@ -786,7 +798,7 @@ Class BuilderInstance
|
|
|
|
|
|
Case ".java"
|
|
|
|
|
|
- If opts.target="android"
|
|
|
+ If opts.target="android"
|
|
|
product.JAVA_FILES.Push( path )
|
|
|
Endif
|
|
|
|