From d21249860adbe090744c272a802dc46ea124cb6a Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Fri, 2 Jan 2015 20:08:30 -0500 Subject: [PATCH] ide: fix emscripten compiler (emcc) detection. --- ide/src/project/Project.ec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec index bc2c2e6..83de568 100644 --- a/ide/src/project/Project.ec +++ b/ide/src/project/Project.ec @@ -3407,9 +3407,9 @@ private: f.Puts("ifndef STATIC_LIBRARY_TARGET\n"); f.Printf("\t$(%s) $(OFLAGS) @$(OBJ)objects.lst $(LIBS)%s -o $(TARGET) $(INSTALLNAME)\n", - ldCommand && ldCommand[0] ? "LD" : containsCXX ? "CXX" : "CC", - //strcmp(compiler.name, "em") == 0 ? " --preload-file __HelloForm.ear" : ""); - strcmp(compiler.name, "em") == 0 ? " --embed-file __HelloForm.ear" : ""); + ldCommand && ldCommand[0] ? "LD" : containsCXX ? "CXX" : "CC", + strstr(compiler.ccCommand, "emcc") == null ? "" : /*" --preload-file "*/" --embed-file " "__HelloForm.ear" + ); if(!GetDebug(config)) { f.Puts("ifndef NOSTRIP\n"); -- 1.8.3.1