Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-dev automerge: 2c05810

automerge: 3b7b0b5

* commit '3b7b0b509b4077688f38f3eab3e80e0db19dc643':
  Revert "Add targetPlatform for executable binaries"

1 files changed, 14 insertions, 14 deletions

diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle
index bd029b2..677f763 100644
--- a/emulator/mksdcard/build.gradle
+++ b/emulator/mksdcard/build.gradle
@@ -2,20 +2,17 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'native-setup'
 
-model {
-    components {
-        mksdcard(NativeExecutableSpec) {
-            sources {
-                c {
-                    source {
-                        srcDir "src/source"
-                        include "**/*.c"
-                    }
-                }
+executables {
+    mksdcard {}
+}
+
+sources {
+    mksdcard {
+        c {
+            source {
+                srcDir "src/source"
+                include "**/*.c"
             }
-            targetPlatform "darwin"
-            targetPlatform "linux"
-            targetPlatform "windows32"
         }
     }
 }
@@ -46,6 +43,9 @@ sdk {
 }
 
 def getExeName(String platform) {
-    return binaries.getByName("${platform}MksdcardExecutable").executableFile
+    // binaries will return a set of binaries
+    def binaries = executables.mksdcard.binaries.matching { it.name == "${platform}MksdcardExecutable" }
+    // calling .exeFile on the set returns an array with the result from each item in the set...
+    return binaries.executableFile.get(0)
 }