dmuratshin 11 years ago
parent
commit
dabb61e84a

+ 2 - 2
.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 55bd1ce8df5448e181747ca0cce6a24c9cba7c4f
+node: 904ee9a78cdefc9ff23dbb8ef65b4e53b308f341
 branch: default
 latesttag: oldrender
-latesttagdistance: 550
+latesttagdistance: 552

+ 3 - 0
examples/Game/part5/src/entry_point.cpp

@@ -4,10 +4,13 @@ This file has Oxygine initialization stuff.
 If you just started you don't need to understand it exactly you could check it later.
 You could start from example.cpp and example.h it has main functions being called from there
 */
+#include "core/oxygine.h"
 #include "Stage.h"
 #include "DebugActor.h"
+
 #include "example.h"
 
+
 using namespace oxygine;
 
 

+ 3 - 0
oxygine/greenlets/src/slp_platformselect.h

@@ -26,7 +26,10 @@
 #include "platform/switch_s390_unix.h"	/* Linux/S390 */
 #elif defined(__GNUC__) && defined(__s390x__) && defined(__linux__)
 #include "platform/switch_s390_unix.h"	/* Linux/S390 zSeries (64-bit) */
+#elif defined(__GNUC__) && defined(__aarch64__)
+#define STACK_MAGIC 0
 #elif defined(__GNUC__) && defined(__arm__)
+
 #ifdef __APPLE__
 #include <TargetConditionals.h>
 #endif

+ 2 - 1
tools/others/update_examples_entry.py

@@ -11,6 +11,7 @@ items = (
      examples + "Game/Part2",
      examples + "Game/Part3",
      examples + "Game/Part4",
+     examples + "Game/Part5",
      examples + "HelloWorld",
      examples + "Match3",
      examples + "TutorialResources",
@@ -28,4 +29,4 @@ def copy(item, name):
 for item in items:
     copy(item, "src/entry_point.cpp")
     #copy(item, "data/app.icf")
-    
+