Skip to content

Commit e81bc54

Browse files
committed
Merge branch 'develop'
2 parents 8be4b91 + 33d0492 commit e81bc54

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

docs/build_xml/HaxeTarget.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Here you can see the various file groups, which are enabled or not depending on
8686
### Experimenting With Hxcpp Generated Code/Build.xml
8787
If you are using external cpp code, or using meta-data to inject xml into the build process, and you are getting a compile or link error, then it can be useful to run the hxcpp build tool without re-running haxe. This lets you hand-edit the build file or generated c++ code until you get things to work. Once you have solved the issues using this technique, then you can move the changes back into the injected/external code.
8888

89-
First, compile haxe with '-v' flag. This gives quite a bit of debug, but will include a like like this:
89+
First, compile haxe with '-v' flag. This gives quite a bit of debug, but will include a line like this:
9090
```
9191
haxelib run hxcpp Build.xml haxe -Dhaxe3="1" -Dhaxe_ver="4.000" -Dhxcpp_api_level="332" -Dsource-header="Generated by Haxe 4.0.0" -I"" -I"C:/Users/Hugh/dev/haxe/std/cpp/_std/" -I"C:/Users/Hugh/dev/haxe/std/"
9292
```

src/hx/gc/Immix.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "GcRegCapture.h"
88
#include <hx/Unordered.h>
99

10+
#include <string>
1011
#include <stdlib.h>
1112

1213

@@ -108,7 +109,7 @@ static size_t sgMaximumFreeSpace = 1024*1024*1024;
108109
#endif
109110

110111
#ifdef EMSCRIPTEN
111-
#define HXCPP_STACK_UP
112+
// #define HXCPP_STACK_UP
112113
#endif
113114

114115

0 commit comments

Comments
 (0)