Merge branch 'nme-collab' of https://github.com/openfl/lime into nme-collab

Conflicts: project/src/ExternalInterface.cpp
2014-04-10 18:25:24 -07:00
parent 618eee5e72 0b3e4ad2a1
commit 453e896cc3
2 changed files with 24 additions and 1 deletions
--- a/project/src/ExternalInterface.cpp
+++ b/project/src/ExternalInterface.cpp
@@ -552,10 +552,24 @@ namespace nme {
 }


+<<<<<<< HEAD
 extern "C" int nme_register_prims();

 extern "C" int lime_register_prims()
 {
 	nme_register_prims();
 	return 0;
-}
+}
+=======
+#ifdef STATIC_LINK
+    
+    extern "C" int nme_register_prims();
+    extern "C" int lime_register_prims()
+    {
+        nme_register_prims();
+
+        return 0;
+    }
+
+#endif //STATIC_LINK
+>>>>>>> 0b3e4ad2a15f7336d45d67f0ffba6eae6fd52b8e