Merge pull request #36 from tfoleyNV/entry-point-indexing

Overhaul handling of entry points and translation units.

1 files changed, 22 insertions, 15 deletions

diff --git a/source/slangc/main.cpp b/source/slangc/main.cpp
index 06f004531..4a783a17c 100644
--- a/source/slangc/main.cpp
+++ b/source/slangc/main.cpp
@@ -12,7 +12,7 @@ using namespace Slang;
 
 static void diagnosticCallback(
     char const* message,
-    void*       userData)
+    void*       /*userData*/)
 {
     fputs(message, stderr);
     fflush(stderr);
@@ -89,29 +89,36 @@ int MAIN(int argc, char** argv)
     }
 #endif
 
-#ifdef _MSC_VER
-    _CrtDumpMemoryLeaks();
-#endif
     return 0;
 }
 
 #ifdef _WIN32
 int wmain(int argc, wchar_t** argv)
 {
-    // Conver the wide-character Unicode arguments to UTF-8,
-    // since that is what Slang expects on the API side.
+    int result = 0;
 
-    List<String> args;
-    for(int ii = 0; ii < argc; ++ii)
-    {
-        args.Add(String::FromWString(argv[ii]));
-    }
-    List<char const*> argBuffers;
-    for(int ii = 0; ii < argc; ++ii)
     {
-        argBuffers.Add(args[ii].Buffer());
+        // Conver the wide-character Unicode arguments to UTF-8,
+        // since that is what Slang expects on the API side.
+
+        List<String> args;
+        for(int ii = 0; ii < argc; ++ii)
+        {
+            args.Add(String::FromWString(argv[ii]));
+        }
+        List<char const*> argBuffers;
+        for(int ii = 0; ii < argc; ++ii)
+        {
+            argBuffers.Add(args[ii].Buffer());
+        }
+
+        result = MAIN(argc, (char**) &argBuffers[0]);
     }
 
-    return MAIN(argc, (char**) &argBuffers[0]);
+#ifdef _MSC_VER
+    _CrtDumpMemoryLeaks();
+#endif
+
+    return result;
 }
 #endif