Changeset 1435 for trunk/src/platform/naclTweet

Timestamp:

Jun 3, 2012, 3:57:58 PM (11 years ago)

Author:

sam

Message:

nacl: remove our old hack of #including the file containing main() from
the NaCl instance object. Now we properly override main() and we can at
last build all the executables as NaCl binaries.

Location:

trunk/src/platform/nacl

Files:

• nacl_instance.cpp (modified) (2 diffs)
• nacl_instance.h (modified) (1 diff)

trunk/src/platform/nacl/nacl_instance.cpp

@@ -25 +25 @@
 #include "platform/nacl/nacl_instance.h"
 #include "platform/nacl/opengl_context.h"
+
+/* One of these wrappers will be overridden by the user's version */
+void lol_nacl_main(void) __attribute__((weak));
+void lol_nacl_main(void) {}
+void lol_nacl_main(int argc, char **argv) __attribute__((weak));
+void lol_nacl_main(int argc, char **argv) {}
+void lol_nacl_main(int argc, char **argv, char **envp) __attribute__((weak));
+void lol_nacl_main(int argc, char **argv, char **envp) {}
 
 namespace lol
@@ -54 +62 @@
 }
 
-}
-#define main OLDMAIN
-#include "../test/tutorial/tut03.cpp"
-#undef main
-namespace lol {
-
-bool NaClInstance::Init(uint32_t /* argc */,
+bool NaClInstance::Init(uint32_t argc,
                         const char* /* argn */[],
-                        const char* /* argv */[])
+                        const char* argv[])
 {
-    Ticker::Setup(60.0f);
-
-    //new Kub();
-    //new DebugQuad();
-    new Fractal(ivec2(640, 480));
-
     // My timer callback
     pp::Module::Get()->core()->CallOnMainThread(
             DELTA_MS, pp::CompletionCallback(&TickCallback, this), PP_OK);
+
+    /* Call the user's main() function. FIXME: run it in a thread */
+    char *env[] = { NULL };
+    lol_nacl_main();
+    lol_nacl_main(argc, const_cast<char **>(argv));
+    lol_nacl_main(argc, const_cast<char **>(argv), (char **)env);
 
     return true;

trunk/src/platform/nacl/nacl_instance.h

@@ -46 +46 @@
 
     ivec2 m_size;
+
+private:
+    static void CallIntMainWrappers(int argc, char const* argn[]);
+    static void CallVoidMainWrappers(int argc, char const* argn[]);
 };