My favorites | Sign in
Project Home Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 203 attachment: hxcpp_absolute_build_paths.patch (11.0 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
diff --git a/build-tool/BuildCommon.xml b/build-tool/BuildCommon.xml
index ffaadad..be671e5 100644
--- a/build-tool/BuildCommon.xml
+++ b/build-tool/BuildCommon.xml
@@ -38,7 +38,7 @@
<!-- You can override the exes an "exe" section on your own .hxcpp_config -->
<!-- You can use replace="1" to change the compiler, or omit to add flags -->

-<include name="${toolchain}-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/${toolchain}-toolchain.xml"/>


<!-- Library files & targets -------------------------------------->
diff --git a/build-tool/android-toolchain.xml b/build-tool/android-toolchain.xml
index b62b814..9e67f64 100644
--- a/build-tool/android-toolchain.xml
+++ b/build-tool/android-toolchain.xml
@@ -2,7 +2,7 @@

<!-- Android TOOLS -------------------------------------->

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>

<path name="${ANDROID_NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${ANDROID_HOST}/bin"/>

@@ -15,7 +15,7 @@
<flag value="--sysroot=${ANDROID_NDK_ROOT}/platforms/android-5/arch-arm"/>
<flag value="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/include"/>
<flag value="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-I${HXCPP}/include"/>
<flag value="-Iinclude"/>
<flag value="-fpic"/>
diff --git a/build-tool/blackberry-toolchain.xml b/build-tool/blackberry-toolchain.xml
index 21ef54a..8a02657 100644
--- a/build-tool/blackberry-toolchain.xml
+++ b/build-tool/blackberry-toolchain.xml
@@ -2,7 +2,7 @@


<path name="${QNX_HOST}/usr/bin/" />
-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>


<!-- BLACKBERRY TOOLS -------------------------------------------------->
@@ -16,7 +16,7 @@
<flag value="-DBLACKBERRY"/>
<flag value="-fvisibility=hidden"/>
<flag value="-fdollars-in-identifiers"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-DHXCPP_LOAD_DEBUG" if="HXCPP_LOAD_DEBUG"/>
<flag value="-DHXCPP_MULTI_THREADED" if="HXCPP_MULTI_THREADED"/>
<flag value="-fpic"/>
diff --git a/build-tool/blackberry-x86-toolchain.xml b/build-tool/blackberry-x86-toolchain.xml
index 63237cc..d72efe7 100644
--- a/build-tool/blackberry-x86-toolchain.xml
+++ b/build-tool/blackberry-x86-toolchain.xml
@@ -2,7 +2,7 @@


<path name="${QNX_HOST}/usr/bin/" />
-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>


<!-- BLACKBERRY TOOLS -------------------------------------------------->
@@ -16,7 +16,7 @@
<flag value="-DBLACKBERRY"/>
<flag value="-fvisibility=hidden"/>
<flag value="-fdollars-in-identifiers"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-DHXCPP_LOAD_DEBUG" if="HXCPP_LOAD_DEBUG"/>
<flag value="-DHXCPP_MULTI_THREADED" if="HXCPP_MULTI_THREADED"/>
<flag value="-fpic"/>
diff --git a/build-tool/cygwin-toolchain.xml b/build-tool/cygwin-toolchain.xml
index ccc6557..f14ed31 100644
--- a/build-tool/cygwin-toolchain.xml
+++ b/build-tool/cygwin-toolchain.xml
@@ -1,6 +1,6 @@
<!-- CYGWIN TOOLS -------------------------------------->

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>

<compiler id="cygwin" exe="env g++" if="cygwin">
<flag value="-c"/>
@@ -9,7 +9,7 @@
<flag value="-O2" unless="debug"/>
<flag value="-DHX_LINUX"/>
<flag value="-DHX_LITTLE_ENDIAN=0" if="HXCPP_BIG_ENDIAN"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-m32" unless="HXCPP_M64"/>
<flag value="-m64" if="HXCPP_M64"/>
<flag value="-I${HXCPP}/include"/>
diff --git a/build-tool/gph-toolchain.xml b/build-tool/gph-toolchain.xml
index b34f708..034ad28 100644
--- a/build-tool/gph-toolchain.xml
+++ b/build-tool/gph-toolchain.xml
@@ -7,7 +7,7 @@
<set name="GPH_TOOL" value="${GPH_ROOT}/" if="windows_host"/>
<set name="GPH_TOOL" value="${GPH_ROOT}/tools/" unless="windows_host"/>

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>

<path name="${GPH_TOOL}/gcc-4.2.4-glibc-2.7-eabi/bin/"/>
<path name="${GPH_TOOL}/gcc-4.2.4-glibc-2.7-eabi/libexec/gcc/arm-gph-linux-gnueabi/4.2.4/"/>
diff --git a/build-tool/iphoneos-toolchain.xml b/build-tool/iphoneos-toolchain.xml
index 961e04d..efcfcbb 100644
--- a/build-tool/iphoneos-toolchain.xml
+++ b/build-tool/iphoneos-toolchain.xml
@@ -4,7 +4,7 @@
<echo value="Using iOS SDK ${IPHONE_VER}" if="VERBOSE"/>

<set name="ARCH" value ="-v7" if="HXCPP_ARMV7" />
-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>
<path name="${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/usr/bin" />

<compiler id="iPhoneOS" exe="g++" if="iphoneos">
@@ -32,7 +32,7 @@
<flag value="-DIPHONE"/>
<flag value="-DIPHONEOS"/>
<flag value="-DHXCPP_CLANG" if="HXCPP_CLANG" />
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-DHX_LITTLE_ENDIAN=0" if="HXCPP_BIG_ENDIAN"/>
<flag value="-I${HXCPP}/include"/>
<cppflag value="-frtti"/>
diff --git a/build-tool/iphonesim-toolchain.xml b/build-tool/iphonesim-toolchain.xml
index 6451181..cba8657 100644
--- a/build-tool/iphonesim-toolchain.xml
+++ b/build-tool/iphonesim-toolchain.xml
@@ -2,7 +2,7 @@

<echo value="Using iOS SDK ${IPHONE_VER}" if="VERBOSE"/>

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>
<path name="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/usr/bin" />

<compiler id="iPhoneSim" exe="g++" if="iphonesim">
@@ -38,7 +38,7 @@
<flag value="-DOBJC_ARC" if="OBJC_ARC" />
<flag value="-Wno-parentheses" if="HXCPP_CLANG" />
<flag value="-Wno-null-dereference" if="HXCPP_CLANG" />
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-DHX_LITTLE_ENDIAN=0" if="HXCPP_BIG_ENDIAN"/>
<flag value="-I${HXCPP}/include"/>
<cppflag value="-frtti"/>
diff --git a/build-tool/linux-toolchain.xml b/build-tool/linux-toolchain.xml
index a2ff356..64aca7c 100644
--- a/build-tool/linux-toolchain.xml
+++ b/build-tool/linux-toolchain.xml
@@ -2,7 +2,7 @@

<!-- LINUX TOOLS -------------------------------------->

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>

<compiler id="linux" exe="g++" if="linux">
<exe name="${CXX}" if="CXX" />
@@ -16,7 +16,7 @@
<flag value="-DHX_LINUX"/>
<flag value="-DHXCPP_MULTI_THREADED" if="HXCPP_MULTI_THREADED"/>
<flag value="-DHX_LITTLE_ENDIAN=0" if="HXCPP_BIG_ENDIAN"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-m32" unless="HXCPP_M64"/>
<flag value="-m64" if="HXCPP_M64"/>
<flag value="-DHXCPP_M64" if="HXCPP_M64"/>
diff --git a/build-tool/mac-toolchain.xml b/build-tool/mac-toolchain.xml
index 41c6f22..8f63753 100644
--- a/build-tool/mac-toolchain.xml
+++ b/build-tool/mac-toolchain.xml
@@ -1,7 +1,7 @@
<xml>
<!-- MACOS TOOLS -------------------------------------------------->

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="10.7" if="OBJC_ARC" unless="MACOSX_DEPLOYMENT_TARGET" />
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="10.5" unless="MACOSX_DEPLOYMENT_TARGET" />
<path name="${DEVELOPER_DIR}/usr/bin" />
@@ -29,7 +29,7 @@
<flag value="-Wno-format-extra-args" if="HXCPP_CLANG" />
<flag value="-fobjc-arc" if="OBJC_ARC" />
<flag value="-DOBJC_ARC" if="OBJC_ARC" />
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<objdir value="obj/darwin${OBJEXT}/" />
<outflag value="-o"/>
<ext value=".o"/>
diff --git a/build-tool/mingw-toolchain.xml b/build-tool/mingw-toolchain.xml
index 08b9565..ec96c1e 100644
--- a/build-tool/mingw-toolchain.xml
+++ b/build-tool/mingw-toolchain.xml
@@ -7,7 +7,7 @@

<path name="${MINGW_ROOT}/bin"/>

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>

<unset name="USE_PRECOMPILED_HEADERS"/>

@@ -17,7 +17,7 @@
<cppflag value="-frtti"/>
<flag value="-g" if="debug"/>
<flag value="-O2"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-DHX_WINDOWS"/>
<flag value="-DHX_LITTLE_ENDIAN=0" if="HXCPP_BIG_ENDIAN"/>
<flag value="-m32" unless="HXCPP_M64"/>
diff --git a/build-tool/msvc-toolchain.xml b/build-tool/msvc-toolchain.xml
index 866ab70..4edfce8 100644
--- a/build-tool/msvc-toolchain.xml
+++ b/build-tool/msvc-toolchain.xml
@@ -22,7 +22,7 @@
<flag value="-c"/>
<flag value="-EHs"/>
<flag value="-I${HXCPP}/include"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-D_CRT_SECURE_NO_DEPRECATE"/>
<flag value="-DHX_WIN_MAIN" if="no_console" unless="HXCPP_DEBUGGER" />
<flag value="-wd4996"/>
diff --git a/build-tool/webos-toolchain.xml b/build-tool/webos-toolchain.xml
index d42c77e..c975909 100644
--- a/build-tool/webos-toolchain.xml
+++ b/build-tool/webos-toolchain.xml
@@ -9,7 +9,7 @@
<set name="CodeSourcery" value="C:\Program Files (x86)\CodeSourcery\Sourcery G++ Lite" unless = "CodeSourcery" />
<path name="${CodeSourcery}/bin" if="windows_host"/>

-<include name="gcc-toolchain.xml"/>
+<include name="${HXCPP}/build-tool/gcc-toolchain.xml"/>


<!-- WEBOS TOOLS -------------------------------------------------->
@@ -26,7 +26,7 @@
<flag value="-mfpu=vfp" if="armv6" />
<flag value="-mfloat-abi=softfp"/>
<flag value="-DWEBOS"/>
- <include name="common-defines.xml" />
+ <include name="${HXCPP}/build-tool/common-defines.xml" />
<flag value="-fvisibility=hidden"/>
<flag value="-fdollars-in-identifiers"/>
<flag value="-DHXCPP_LOAD_DEBUG" if="HXCPP_LOAD_DEBUG"/>
diff --git a/runtime/BuildLibs.xml b/runtime/BuildLibs.xml
index fe8b2de..b9fd934 100644
--- a/runtime/BuildLibs.xml
+++ b/runtime/BuildLibs.xml
@@ -2,7 +2,7 @@

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>

-<set name="RUNTIME" value="./"/>
+<set name="RUNTIME" value="${HXCPP}/runtime"/>

<set name="LIBEXTRA" value=".iphoneos-v7" if="iphoneos"/>
<set name="LIBEXTRA" value=".iphoneos" if="iphoneos" unless="HXCPP_ARMV7" />
@@ -114,10 +114,10 @@


<files id="nekoapi" dir="${RUNTIME}">
- <depend name="libs/nekoapi/neko.h"/>
+ <depend name="${HXCPP}/runtime/libs/nekoapi/neko.h"/>
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
- <file name="libs/nekoapi/NekoAPI.cpp"/>
+ <file name="${HXCPP}/runtime/libs/nekoapi/NekoAPI.cpp"/>
</files>

<set name="NEKOPATH" value="${NEKO_INSTALL_PATH}" unless="NEKOPATH" if="NEKO_INSTALL_PATH" />
Powered by Google Project Hosting