From 95a87dbd77cd4e552cb329df6b1b27d69860e4b8 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Fri, 30 Dec 2016 10:04:07 -0800 Subject: [PATCH] Fix hxProject.merge for architectures --- lime/project/HXProject.hx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lime/project/HXProject.hx b/lime/project/HXProject.hx index d8049329a..75d8e2001 100644 --- a/lime/project/HXProject.hx +++ b/lime/project/HXProject.hx @@ -752,6 +752,7 @@ class HXProject { config.merge (project.config); + architectures = ArrayHelper.concatUnique (architectures, project.architectures); assets = ArrayHelper.concatUnique (assets, project.assets); dependencies = ArrayHelper.concatUnique (dependencies, project.dependencies, true); haxeflags = ArrayHelper.concatUnique (haxeflags, project.haxeflags); @@ -1359,4 +1360,4 @@ class HXProject { } -} \ No newline at end of file +}