kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hxProject.merge for architectures

Browse Source
This commit is contained in:
Joshua Granick
2016-12-30 10:04:07 -08:00
committed by GitHub
parent ec7c449e40
commit 95a87dbd77
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lime/project/HXProject.hx
View File

@@ -752,6 +752,7 @@ class HXProject {
config.merge (project.config); config.merge (project.config);
architectures = ArrayHelper.concatUnique (architectures, project.architectures);
assets = ArrayHelper.concatUnique (assets, project.assets); assets = ArrayHelper.concatUnique (assets, project.assets);
dependencies = ArrayHelper.concatUnique (dependencies, project.dependencies, true); dependencies = ArrayHelper.concatUnique (dependencies, project.dependencies, true);
haxeflags = ArrayHelper.concatUnique (haxeflags, project.haxeflags); haxeflags = ArrayHelper.concatUnique (haxeflags, project.haxeflags);
@@ -1359,4 +1360,4 @@ class HXProject {
} }
} }