Skip to content

Upgrade HashLink to latest (1.16) for MinGW fixes #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NotHyper-474 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade HashLink to latest (1.16) for MinGW fixes #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23672d2
Upgrade HashLink to `latest` (1.16) for MinGW fixes
NotHyper-474 Apr 12, 2026
dcb8bec
MinGW fixes for `HashLink`
NotHyper-474 Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions project/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@
<ext value=".ndll" if="windows || mac || linux" />
<ext value=".hdll" if="LIME_HASHLINK" />

<libpath name="../templates/bin/hl/${BINDIR}" if="LIME_HASHLINK" />

<section if="windows">

<section unless="mingw">
Expand Down Expand Up @@ -397,8 +399,6 @@

<section if="LIME_HASHLINK">

<lib name="-libpath:../templates/bin/hl/${BINDIR}" />

<lib name="libhl.lib" />

</section>
Expand All @@ -413,8 +413,6 @@

<section if="LIME_HASHLINK">

<lib name="-L../templates/bin/hl/${BINDIR}" />

<lib name="-lhl" />

</section>
Expand Down Expand Up @@ -449,8 +447,6 @@

<vflag name="-install_name" value="@executable_path/lime.hdll" />

<lib name="-L../templates/bin/hl/${BINDIR}" />

<lib name="-lhl" />

</section>
Expand Down Expand Up @@ -493,7 +489,7 @@

<section if="LIME_HASHLINK">

<section if="windows">
<section if="isMsvc">

<copyFile name="lime.lib" from="obj/lib" overwrite="true" toolId="dll" unless="debug" />
<copyFile name="lime-debug.lib" from="obj/lib" overwrite="true" toolId="dll" if="debug" />
Expand Down
61 changes: 36 additions & 25 deletions project/BuildHashlink.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<files id="hl">
<compilerflag value="-I${HASHLINK_PATH}/src" />
<compilerflag value="-municode" if="mingw" />

<file name="src/hashlink_main.c" tag="main" />
<file name="${HASHLINK_PATH}/src/code.c" />
Expand All @@ -26,6 +27,8 @@
<compilerflag value="-DLIBHL_EXPORTS" />
<compilerflag value="-DHAVE_CONFIG_H" />
<compilerflag value="-DPCRE2_CODE_UNIT_WIDTH=16" />
<compilerflag value="-DPCRE2_STATIC" />
<compilerflag value="-municode" if="mingw" />

<compilerflag value="-I${HASHLINK_PATH}/src" />
<compilerflag value="-I${HASHLINK_PATH}/include" />
Expand Down Expand Up @@ -58,7 +61,7 @@
<file name="${HASHLINK_PATH}/src/std/ucs2.c" />

<!-- PCRE -->
<file name="${HASHLINK_PATH}/include/pcre/pcre2_auto_possess.c" />
<file name="${HASHLINK_PATH}/include/pcre/pcre2_auto_possess.c" />
<file name="${HASHLINK_PATH}/include/pcre/pcre2_chartables.c" />
<file name="${HASHLINK_PATH}/include/pcre/pcre2_compile.c" />
<file name="${HASHLINK_PATH}/include/pcre/pcre2_config.c" />
Expand Down Expand Up @@ -102,7 +105,9 @@
<compilerflag value="-DMBEDTLS_THREADING_C" />
<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows" />
<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows" />
<compilerflag value="/std:c11" if="windows" />
<compilerflag value="/std:c11" if="isMsvc" />
<compilerflag value="-municode" if="mingw" />

<file name="${HASHLINK_PATH}/libs/ssl/ssl.c" />
</files>

Expand All @@ -127,6 +132,7 @@
<compilerflag value="-I/usr/local/opt/jpeg-turbo/include" if="mac" />
<compilerflag value="-I/usr/local/opt/libvorbis/include" if="mac" />

<compilerflag value="-municode" if="mingw" />

<file name="${HASHLINK_PATH}/libs/fmt/fmt.c" />
<file name="${HASHLINK_PATH}/libs/fmt/sha1.c" />
Expand Down Expand Up @@ -246,27 +252,34 @@
</files>
<files id="ui">
<compilerflag value="-I${HASHLINK_PATH}/src" />
<compilerflag value="-municode" if="mingw" />

<file name="${HASHLINK_PATH}/libs/ui/ui_stub.c" unless="windows" />
<file name="${HASHLINK_PATH}/libs/ui/ui_win.c" if="windows" />
</files>
<files id="uv">
<compilerflag value="-I${HASHLINK_PATH}/src" />
<compilerflag value="-I/usr/local/include" if="mac" />
<compilerflag value="-municode" if="mingw" />

<file name="${HASHLINK_PATH}/libs/uv/uv.c" />

<section if="windows">
<compilerflag value="-I${HASHLINK_PATH}/include/libuv/include" />
<compilerflag value="-I${HASHLINK_PATH}/include/libuv/src" />
<compilerflag value="-DUV_EXPORTS" />
<compilerflag value="-DBUILDING_UV_SHARED" />
<file name="${HASHLINK_PATH}/include/libuv/src/fs-poll.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/idna.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/inet.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/strscpy.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/threadpool.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/timer.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/uv-common.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/version.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/async.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/core.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/detect-wakeup.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/dl.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/error.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/fs-event.c" />
Expand All @@ -279,13 +292,10 @@
<file name="${HASHLINK_PATH}/include/libuv/src/win/poll.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/process-stdio.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/process.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/req.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/signal.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/snprintf.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/stream.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/tcp.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/thread.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/timer.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/tty.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/udp.c" />
<file name="${HASHLINK_PATH}/include/libuv/src/win/util.c" />
Expand Down Expand Up @@ -313,6 +323,7 @@
<section if="windows">
<lib name="user32.lib" />
<lib name="ws2_32.lib" />
<lib name="winmm.lib" />
</section>
</target>

Expand All @@ -325,8 +336,7 @@
<vflag name="-install_name" value="@executable_path/ssl.hdll" if="mac" />

<lib name="-lhl" unless="windows" />
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
<libpath name="${OUTPUT_DIR}/${BINDIR}" />
<lib name="libhl.lib" if="windows" />

<lib name="Advapi32.lib" if="windows" />
Expand All @@ -347,8 +357,7 @@
<vflag name="-install_name" value="@executable_path/mysql.hdll" if="mac" />

<lib name="-lhl" unless="windows" />
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
<libpath name="${OUTPUT_DIR}/${BINDIR}" />
<lib name="libhl.lib" if="windows" />
<lib name="ws2_32.lib" if="windows" />
</target>
Expand All @@ -373,8 +382,7 @@
<lib name="-lturbojpeg" unless="windows" />

<lib name="-lhl" unless="windows" />
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
<libpath name="${OUTPUT_DIR}/${BINDIR}" />
<lib name="libhl.lib" if="windows" />
<lib name="${HASHLINK_PATH}/include/turbojpeg/x64/simd.lib" if="windows HXCPP_M64" />
<lib name="${HASHLINK_PATH}/include/turbojpeg/x86/simd.lib" if="windows" unless="HXCPP_M64" />
Expand All @@ -388,9 +396,8 @@
<vflag name="-install_name" value="@executable_path/ui.hdll" if="mac" />

<lib name="-lhl" unless="windows" />
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<libpath name="${OUTPUT_DIR}/${BINDIR}" />
<section if="windows">
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" />
<lib name="libhl.lib" />
<lib name="user32.lib" />
<lib name="gdi32.lib" />
Expand All @@ -409,15 +416,17 @@

<lib name="-luv" unless="windows" />
<lib name="-lhl" unless="windows" />
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<libpath name="${OUTPUT_DIR}/${BINDIR}" />
<section if="windows">
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" />
<lib name="ole32.lib" />
<lib name="shell32.lib" />
<lib name="dbghelp.lib" />
<lib name="libhl.lib" />
<lib name="psapi.lib" />
<lib name="iphlpapi.lib" />
<lib name="userenv.lib" />
<lib name="advapi32.lib" if="windows" />
<lib name="ws2_32.lib" if="windows" />
<lib name="advapi32.lib" />
<lib name="ws2_32.lib" />
</section>
</target>

Expand All @@ -429,10 +438,10 @@

<!-- Make hashlink pick up binaries in the same directory as itself -->
<lib name="-Wl,-rpath=$ORIGIN" if="linux" />
<flag value="-municode" if="mingw" />

<lib name="-lhl" unless="windows" />
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
<libpath name="${OUTPUT_DIR}/${BINDIR}" />
<lib name="libhl.lib" if="windows" />
</target>

Expand All @@ -448,10 +457,12 @@
<target id="uv" />
</target>

<copyFile name="libhl.lib" from="obj/lib" overwrite="true" toolId="dll" if="windows" />
<copyFile name="ssl.lib" from="obj/lib" allowMissing="true" overwrite="true" toolid="dll" if="windows" />
<copyFile name="mysql.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
<copyFile name="fmt.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
<copyFile name="ui.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
<copyFile name="uv.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
<section if="windows">
<copyFile name="libhl.lib" from="obj/lib" overwrite="true" toolId="dll" if="isMsvc" />
<copyFile name="ssl.lib" from="obj/lib" allowMissing="true" overwrite="true" toolid="dll" />
<copyFile name="mysql.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
<copyFile name="fmt.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
<copyFile name="ui.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
<copyFile name="uv.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
</section>
</xml>
1 change: 1 addition & 0 deletions project/include/system/CFFI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#define HL_NAME(n) lime_##n
#include <hl.h>
#undef _GUID
#undef DEFINE_PRIM
#define DEFINE_HL_PRIM(t, name, args) DEFINE_PRIM_WITH_NAME(t, name, args, name)

Expand Down
2 changes: 1 addition & 1 deletion project/lib/hashlink
Open in desktop
Submodule hashlink updated 557 files
4 changes: 2 additions & 2 deletions project/src/hashlink_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifdef HX_WIN_MAIN
extern int wmain(int argc, wchar_t *argv[]);

int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
return wmain(__argc, __argv);
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
return wmain(__argc, __wargv);
}
#endif
2 changes: 1 addition & 1 deletion src/lime/tools/HashlinkHelper.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import hxp.System;

class HashlinkHelper
{
public static inline var BUNDLED_HL_VER = "1.14.0";
public static inline var BUNDLED_HL_VER = "1.16.0";

public static function copyHashlink(project:HXProject, targetDirectory:String, applicationDirectory:String, executablePath:String, ?is64 = true)
{
Expand Down
2 changes: 0 additions & 2 deletions tools/platforms/WindowsPlatform.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,6 @@ class WindowsPlatform extends PlatformTarget
{
ProjectHelper.copyLibrary(project, ndll, "Windows" + (is64 ? "64" : ""), "", ".hdll", applicationDirectory, project.debug,
".hdll");
ProjectHelper.copyLibrary(project, ndll, "Windows" + (is64 ? "64" : ""), "", ".lib", applicationDirectory, project.debug,
".lib");
}
else
{
Expand Down