2
0
Mark Sibly 8 жил өмнө
parent
commit
cc26980d8b

+ 12 - 6
src/mx2cc/buildproduct.monkey2

@@ -116,10 +116,6 @@ Class BuildProduct
 	
 		If Not assetsDir.EndsWith( "/" ) assetsDir+="/"
 		
-		DeleteDir( assetsDir,True )
-		
-		CreateDir( assetsDir )
-		
 		Local assetFiles:=New StringMap<String>
 		
 		For Local src:=Eachin ASSET_FILES
@@ -147,6 +143,12 @@ Class BuildProduct
 			
 		Next
 		
+		If assetFiles.Empty Return
+		
+		DeleteDir( assetsDir,True )
+		
+		CreateDir( assetsDir )
+		
 		CopyAssetFiles( assetFiles )
 	End
 
@@ -489,9 +491,11 @@ Class GccBuildProduct Extends BuildProduct
 		outputFile=opts.product
 		If Not outputFile outputFile=module.outputDir+module.name
 		
-		Local assetsDir:=ExtractDir( outputFile )+"assets/"
+		Local productDir:=ExtractDir( outputFile )
 		
-		Local dllsDir:=ExtractDir( outputFile )
+		Local assetsDir:=productDir+"assets/"
+		
+		Local dllsDir:=productDir
 
 		Local cmd:=LD_CMD+LD_OPTS
 		
@@ -590,6 +594,8 @@ Class GccBuildProduct Extends BuildProduct
 #Else
 		cmd+=lnkFiles
 #Endif
+		CreateDir( productDir,True )
+		
 		CopyAssets( assetsDir )
 		
 		CopyDlls( dllsDir )

+ 1 - 1
src/mx2cc/mx2cc.monkey2

@@ -26,7 +26,7 @@ Using mx2..
 
 Global StartDir:String
 
-Const TestArgs:="mx2cc makedocs monkey libc miniz stb-image stb-image-write stb-vorbis std"
+Const TestArgs:="mx2cc makedocs mojo3d"	' monkey libc miniz stb-image stb-image-write stb-vorbis std"
 
 'Const TestArgs:="mx2cc makeapp src/mx2cc/test.monkey2"