Skip to content

Commit 63cb815

Browse files
committed
Rename cross-windows* targets to mingw-windows*
1 parent beb7fd4 commit 63cb815

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,14 @@ linux64: CFLAGS += -fPIC
181181
linux64: build/linux_x86_64/liblua_pluginscript.so
182182

183183
windows32: build/windows_x86/lua_pluginscript.dll
184-
cross-windows32: CROSS = i686-w64-mingw32-
185-
cross-windows32: MAKE_LUAJIT_ARGS += HOST_CC="$(CC) -m32" CROSS="i686-w64-mingw32-" LDFLAGS=-static-libgcc
186-
cross-windows32: windows32
184+
mingw-windows32: CROSS = i686-w64-mingw32-
185+
mingw-windows32: MAKE_LUAJIT_ARGS += HOST_CC="$(CC) -m32" CROSS="$(CROSS)" LDFLAGS=-static-libgcc
186+
mingw-windows32: windows32
187187

188188
windows64: build/windows_x86_64/lua_pluginscript.dll
189-
cross-windows64: CROSS = x86_64-w64-mingw32-
190-
cross-windows64: MAKE_LUAJIT_ARGS += HOST_CC="$(CC)" CROSS="x86_64-w64-mingw32-" LDFLAGS=-static-libgcc
191-
cross-windows64: windows64
189+
mingw-windows64: CROSS = x86_64-w64-mingw32-
190+
mingw-windows64: MAKE_LUAJIT_ARGS += HOST_CC="$(CC)" CROSS="$(CROSS)" LDFLAGS=-static-libgcc
191+
mingw-windows64: windows64
192192

193193
osx-x86_64: build/osx_x86_64/lua_pluginscript.dylib
194194
osx-arm64: build/osx_arm64/lua_pluginscript.dylib

README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,12 @@ make linux64 # x86_64
238238
make linux32 # x86
239239
make osx64 \ # "universal" multiarch x86_64 + amd64 dylib
240240
MACOSX_DEPLOYMENT_TARGET=XX.YY
241+
242+
# Cross-compiling for Windows using MinGW
243+
make mingw-windows64 # x86_64
244+
make mingw-windows32 # x86
245+
246+
# Cross-compiling for Android using NDK
241247
make android-armv7a \ # Android ARMv7
242248
NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin
243249
make android-aarch64 \ # Android ARM64
@@ -246,12 +252,20 @@ make android-x86 \ # Android x86
246252
NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin
247253
make android-x86_64 \ # Android x86_64
248254
NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin
255+
256+
# If you plan in using the export plugin, this is also required
257+
make plugin
249258
```
250259

251260
The GDNativeLibrary file `lua_pluginscript.gdnlib` is already configured to use
252261
the built files stored in the `build` folder, so that one can use this
253-
repository directly inside a Godot project under the folder
254-
`addons/godot-lua-pluginscript`.
262+
repository directly inside a Godot project under the folder `addons/godot-lua-pluginscript`.
263+
264+
After building the desired libraries, a distribution zip can be built with:
265+
266+
```sh
267+
make dist
268+
```
255269

256270

257271
## Third-party software

0 commit comments

Comments
 (0)