Skip to content
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

Jump to bottom

Update hashlink. #1517

Merged
merged 38 commits into from
Jun 2, 2022
Merged

Update hashlink. #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
892d461
Close #1516.
Apprentice-Alchemist Jan 24, 2022
daca1a2
Update hashlink.
Apprentice-Alchemist Jan 24, 2022
a3b3d85
Update hashlink.
Apprentice-Alchemist Jan 24, 2022
c394aea
Rename a few functions.
Apprentice-Alchemist Jan 24, 2022
a288fec
Add hashlink as a submodule.
Apprentice-Alchemist Feb 27, 2022
9ced089
Update hashlink.
Apprentice-Alchemist Feb 28, 2022
e479334
Make windows work, install required packages on macOS.
Apprentice-Alchemist Feb 28, 2022
97f718b
Link with libpthread.
Apprentice-Alchemist Feb 28, 2022
b72f45e
Only copy libhl.lib on Windows.
Apprentice-Alchemist Feb 28, 2022
2d2e645
Fix macOS and Linux CI.
Apprentice-Alchemist Mar 2, 2022
054c201
Try fixing mac and linux some more.
Apprentice-Alchemist Mar 5, 2022
aa62d78
Add some more -pthread.
Apprentice-Alchemist Mar 9, 2022
5c2e557
Set android platform to 21 in BuildHashlink.xml.
Apprentice-Alchemist Mar 9, 2022
a44fe36
Put hashlink binaries in templates/bin again.
Apprentice-Alchemist Mar 9, 2022
f544134
Fix libpaths.
Apprentice-Alchemist Mar 12, 2022
18f680e
Fix haxelime/lime#1516 again.
Apprentice-Alchemist Mar 12, 2022
cb3b024
Implement `lime setup hl` in a hopefully better way.
Apprentice-Alchemist Mar 12, 2022
d6b3e82
Update hashlink.
Apprentice-Alchemist Mar 19, 2022
4c001e1
Also build fmt, ui and uv libraries.
Apprentice-Alchemist Mar 19, 2022
c2595b9
Fixup CI, and some includes.
Apprentice-Alchemist Mar 19, 2022
abdf145
Why the hell are we still doing 32 bit.
Apprentice-Alchemist Mar 19, 2022
0f8c5a6
Fix typo.
Apprentice-Alchemist Mar 19, 2022
de24e7b
Fix INT32 redefined error in libjpeg.
Apprentice-Alchemist Apr 14, 2022
442c219
Add more libs for libuv.
Apprentice-Alchemist Apr 14, 2022
50cc49c
Fix filewatcher RemoveDirectory issue.
Apprentice-Alchemist Apr 14, 2022
3a55a30
Add some include paths, to try and make mac work.
Apprentice-Alchemist Apr 14, 2022
668b3f7
Fix the HashlinkHelper
Apprentice-Alchemist Apr 15, 2022
1471d8a
Try to fix CI.
Apprentice-Alchemist Apr 15, 2022
0238825
Update hashlink to 1.12.
Apprentice-Alchemist Apr 28, 2022
6f19600
Fix Haxe 3 compat.
Apprentice-Alchemist Apr 28, 2022
7dbc4e9
More haxe 3 fixes.
Apprentice-Alchemist Apr 28, 2022
362ab26
Merge branch 'develop' into feature/update-hashlink
Apprentice-Alchemist May 8, 2022
b2546aa
Try fixing macOS and support no_console Windows subsystem.
Apprentice-Alchemist May 18, 2022
ad70700
Try to fix Windows mess a bit.
Apprentice-Alchemist May 19, 2022
1c35f44
Fix building lime.hdll.
Apprentice-Alchemist May 19, 2022
9fa6a20
Fix CI, hopefully.
Apprentice-Alchemist May 20, 2022
46ad92f
Why are we still supporting haxe 3?
Apprentice-Alchemist May 20, 2022
b4e6764
Fix YML syntax error.
Apprentice-Alchemist May 20, 2022
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
57 changes: 55 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev libmbedtls-dev libpng-dev libturbojpeg-dev libuv1-dev libvorbis-dev

- uses: krdlab/setup-haxe@v1
with:
Expand Down Expand Up @@ -59,13 +59,22 @@ jobs:
if-no-files-found: error

- uses: actions/upload-artifact@v2
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
with:
name: Linux64-NDLL
path: |
ndll/Linux64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v2
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
with:
name: Linux64-Hashlink
path: |
templates/bin/hl/Linux64
if-no-files-found: error

macos-ndll:
runs-on: macos-10.15
steps:
Expand All @@ -84,6 +93,10 @@ jobs:

- name: Install Haxe dependencies
run: |
pushd project/lib/hashlink
brew update
brew bundle
popd
haxelib install hxcpp --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand Down Expand Up @@ -111,6 +124,13 @@ jobs:
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v2
with:
name: Mac64-Hashlink
path: |
templates/bin/hl/Mac64
if-no-files-found: error

windows-ndll:
runs-on: windows-latest
steps:
Expand Down Expand Up @@ -165,6 +185,19 @@ jobs:
!**/.gitignore
if-no-files-found: error

# - uses: actions/upload-artifact@v2
# with:
# name: Windows-Hashlink
# path: |
# templates/bin/hl/Windows
# if-no-files-found: error
- uses: actions/upload-artifact@v2
with:
name: Windows64-Hashlink
path: |
templates/bin/hl/Windows64
if-no-files-found: error

android-ndll:
needs: macos-ndll
runs-on: macos-10.15
Expand Down Expand Up @@ -315,7 +348,7 @@ jobs:
haxelib dev lime $GITHUB_WORKSPACE
haxelib run lime rebuild tools -nocolor -verbose -nocffi
haxelib run lime setup -alias -y -nocffi

cp project/lib/hashlink/other/osx/entitlements.xml templates/bin/hl/entitlements.xml
- uses: actions/download-artifact@v2
with:
name: Android-NDLL
Expand Down Expand Up @@ -351,6 +384,26 @@ jobs:
name: Windows64-NDLL
path: ndll/Windows64/

# - uses: actions/download-artifact@v2
# with:
# name: Windows-Hashlink
# path: templates/bin/hl/Windows

- uses: actions/download-artifact@v2
with:
name: Windows64-Hashlink
path: templates/bin/hl/Windows64

- uses: actions/download-artifact@v2
with:
name: Mac64-Hashlink
path: templates/bin/hl/Mac64

- uses: actions/download-artifact@v2
with:
name: Linux64-Hashlink
path: templates/bin/hl/Linux64

- uses: actions/upload-artifact@v2
with:
name: lime-haxelib
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
Export/
ndll/*/lime*
ndll/*/liblime*
ndll/*/*.hdll
ndll/*/*.hash
ndll/*/*.so
ndll/*/*.dylib
ndll/*/*.lib
ndll/*/hl*
ndll/*/*.dll
templates/bin/hl/*
project/all_objs
project/obj
project/vc*.pdb
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,7 @@
[submodule "project/lib/mojoal"]
path = project/lib/mojoal
url = https://github.com/openfl/libmojoal
[submodule "project/lib/hashlink"]
path = project/lib/hashlink
url = https://github.com/HaxeFoundation/hashlink

52 changes: 27 additions & 25 deletions project/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<set name="ios" value="1" if="iphone" />
<set name="tvos" value="1" if="appletv" />

<set name="LIME_CAIRO" value="1"/>
<set name="LIME_CAIRO" value="1" />
<set name="LIME_CURL" value="1" unless="emscripten || winrt" />
<set name="LIME_EFSW" value="1" if="windows || mac || linux" unless="winrt" />
<set name="LIME_JPEG" value="1" />
Expand Down Expand Up @@ -63,10 +63,10 @@
<section if="LIME_CAIRO">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/default/" unless="windows || mac || linux"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/linux/" if="linux"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/windows/" if="windows"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/mac/" if="mac"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/default/" unless="windows || mac || linux" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/linux/" if="linux" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/windows/" if="windows" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/mac/" if="mac" />
<compilerflag value="-DLIME_CAIRO" />
<compilerflag value="-DHAVE_CONFIG_H" />
<compilerflag value="-DCAIRO_WIN32_STATIC_BUILD" if="windows" />
Expand Down Expand Up @@ -122,6 +122,8 @@

</section>

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/hashlink/src" />

<section if="LIME_HASHLINK">

<compilerflag value="-DLIME_HASHLINK" />
Expand Down Expand Up @@ -216,22 +218,22 @@
<section unless="emscripten">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" unless="winrt"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/winrt/" if="winrt"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" unless="winrt" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/winrt/" if="winrt" />

<compilerflag value="-DHAVE_LIBC" />

</section>

<section if="rpi">

<compilerflag value="-I/opt/vc/include"/>
<compilerflag value="-I/opt/vc/include/interface/vcos/pthreads"/>
<compilerflag value="-I/opt/vc/include/interface/vmcs_host/linux"/>
<compilerflag value="-I/opt/vc/include" />
<compilerflag value="-I/opt/vc/include/interface/vcos/pthreads" />
<compilerflag value="-I/opt/vc/include/interface/vmcs_host/linux" />
<compilerflag value="-lbrcmGLESv2" />
<compilerflag value="-lbrcmEGL" />
<compilerflag value="-Wl,--no-undefined -lm -L/opt/vc/lib -lbcm_host -ldl -lpthread -lrt" />
Expand Down Expand Up @@ -323,7 +325,7 @@

<files id="android-cpufeatures">

<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android"/>
<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
<file name="${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.c" />

</files>
Expand Down Expand Up @@ -420,7 +422,7 @@
<lib name="Xinput.lib" if="winrt" />
<lib name="DXGI.lib" if="winrt" />

<lib name="-libpath:../templates/bin/hl/windows" if="LIME_HASHLINK" />
<lib name="-libpath:../templates/bin/hl/${BINDIR}" if="LIME_HASHLINK" />
<lib name="libhl.lib" if="LIME_HASHLINK" />
<!-- <lib name="-delayload:libhl.dll" /> -->

Expand All @@ -434,14 +436,14 @@
<lib name="-lgc" if="LIME_NEKO" />
<lib name="-lm" if="LIME_NEKO" />

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

</section>

<section if="mac">

<vflag name="-l" value="iconv"/>
<vflag name="-l" value="iconv" />
<vflag name="-framework" value="IOKit" />
<vflag name="-framework" value="Foundation" />
<vflag name="-framework" value="CoreAudio" />
Expand All @@ -453,12 +455,12 @@
<vflag name="-framework" value="ForceFeedback" />
<vflag name="-framework" value="Carbon" />
<vflag name="-framework" value="AppKit" />
<vflag name="-framework" value="OpenAL"/>
<vflag name="-framework" value="OpenAL" />

<lib name="/opt/local/lib/libgc.a" if="LIME_NEKO" />
<lib name="-lm" if="LIME_NEKO" />

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

</section>
Expand Down Expand Up @@ -498,8 +500,8 @@
<vflag name="-framework" value="OpenGLES" />
<vflag name="-framework" value="AudioToolbox" />
<vflag name="-framework" value="AudioUnit" />
<vflag name="-framework" value="OpenAL"/>
<vflag name="-framework" value="GameController"/>
<vflag name="-framework" value="OpenAL" />
<vflag name="-framework" value="GameController" />
<!-- <vflag name="-framework" value="CoreBluetooth" /> -->

<lib name="-ldl" />
Expand All @@ -517,9 +519,9 @@
<vflag name="-framework" value="OpenGLES" />
<vflag name="-framework" value="AudioToolbox" />
<vflag name="-framework" value="AudioUnit" />
<vflag name="-framework" value="OpenAL"/>
<vflag name="-framework" value="CoreMotion"/>
<vflag name="-framework" value="CoreText"/>
<vflag name="-framework" value="OpenAL" />
<vflag name="-framework" value="CoreMotion" />
<vflag name="-framework" value="CoreText" />
<!-- <vflag name="-framework" value="CoreBluetooth" /> -->

<lib name="-ldl" />
Expand Down
Loading