Skip to content

Cleanup old/unfunctional targets aswell as useless and no longer functional code. #46

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
MAJigsaw77 wants to merge 18 commits into
base: mobile/main
Choose a base branch
from
Open

Cleanup old/unfunctional targets aswell as useless and no longer functional code. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6c3fc35
Remove `UWP`/`WinJS`
MAJigsaw77 Mar 2, 2026
294b460
Remove `WinRT`
MAJigsaw77 Mar 2, 2026
41e5ce9
Remove `WebOS`
MAJigsaw77 Mar 2, 2026
3642a6e
Remove `Tizen`
MAJigsaw77 Mar 2, 2026
1646c5f
Remove `BlackBerry`
MAJigsaw77 Mar 2, 2026
ccb854b
Remove `Java`
MAJigsaw77 Mar 2, 2026
186ac81
Remove `Firefox`
MAJigsaw77 Mar 2, 2026
5b2866b
Remove `CS`
MAJigsaw77 Mar 2, 2026
5fb94af
Remove `NodeJS`, the target from the deprecated `nodejs` haxelib
MAJigsaw77 Mar 2, 2026
10c912e
Remove `Neko`, the desktop buildable target
MAJigsaw77 Mar 2, 2026
7a10d97
Remove old `yui` compressor from `HTML5`
MAJigsaw77 Mar 2, 2026
dca08e4
Cleanup `project` from the removed targets code
MAJigsaw77 Mar 3, 2026
6f428bf
Remove `LIME_FAUDIO` unused code
MAJigsaw77 Mar 3, 2026
afa1a33
Remove `LIME_NEKO` unused code
MAJigsaw77 Mar 3, 2026
9dae63c
Remove `LIME_VPX` unused code
MAJigsaw77 Mar 3, 2026
ec85650
Remove `LIME_WEBM` unused code
MAJigsaw77 Mar 3, 2026
7b7118d
Cleanup `Build.xml` more
MAJigsaw77 Mar 3, 2026
957678c
Cleanup the native `project` code some more
MAJigsaw77 Mar 3, 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
1 change: 0 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ nddl/*/libnme*
project/all_objs
project/obj
project/vc*.pdb
project/winrt/shaders/
*.userprefs
*.swp
.idea/
Expand Down
12 changes: 0 additions & 12 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
path = project/lib/zlib
url = https://github.com/madler/zlib
shallow = true
[submodule "project/lib/neko"]
path = project/lib/neko
url = https://github.com/HaxeFoundation/neko
shallow = true
[submodule "project/lib/png"]
path = project/lib/png
url = https://github.com/glennrp/libpng
Expand Down Expand Up @@ -59,14 +55,6 @@
path = project/lib/efsw
url = https://github.com/SpartanJ/efsw
shallow = true
[submodule "project/lib/vpx"]
path = project/lib/vpx
url = https://github.com/webmproject/libvpx
shallow = true
[submodule "project/lib/webm"]
path = project/lib/webm
url = https://github.com/webmproject/libwebm
shallow = true
[submodule "project/lib/mbedtls"]
path = project/lib/mbedtls
url = https://github.com/Mbed-TLS/mbedtls
Expand Down
8 changes: 2 additions & 6 deletions include.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<set name="lime" />

<define name="native" if="cpp || neko || nodejs || cs || java || hl" />
<define name="native" if="cpp || neko || hl" />
<define name="howlerjs" if="html5" />

<define name="lime-cairo" if="native" />
Expand All @@ -25,17 +25,13 @@
<define name="lime-vorbis" if="native" />
<define name="lime-webgl" if="html5" />

<define name="no-typedarray-inline" if="cs" />
<haxedef name="no-compilation" />

<templatePath name="templates" />
<source path="externs/air" if="air" />
<haxeflag name="--macro" value="allowPackage('sys')" if="air" />
<sample path="samples" unless="openfl" />

<haxelib name="nodejs" if="nodejs" />
<haxelib name="format" if="java" />

<target name="ps3" handler="lime-ps3" />
<haxelib name="lime-ps3" if="ps3" />

Expand Down Expand Up @@ -77,7 +73,7 @@
<section unless="force-synchronous || force_synchronous">
<haxedef name="lime-threads" if="neko || cpp || html5" unless="emscripten" />
<!-- `target.threaded` isn't available, so enumerate the targets instead. -->
<haxedef name="lime-threads" if="cs || java || python || hl" unless="${${haxe_ver} < 4}" />
<haxedef name="lime-threads" if="python || hl" unless="${${haxe_ver} < 4}" />
</section>

<section if="cpp ${${haxe_ver} < 3.3}" unless="static_link">
Expand Down
116 changes: 23 additions & 93 deletions project/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,31 @@
<set name="ios" value="1" if="iphone" />
<set name="tvos" value="1" if="appletv" />
<set name="LIME_CAIRO" value="1" />
<set name="LIME_CURL" value="1" unless="winrt" />
<set name="LIME_EFSW" value="1" if="windows || mac || linux" unless="winrt" />
<set name="LIME_CURL" value="1" />
<set name="LIME_EFSW" value="1" if="windows || mac || linux" />
<set name="LIME_JPEG" value="1" />
<!-- <set name="LIME_FAUDIO" value="1" /> -->
<set name="LIME_FREETYPE" value="1" />
<set name="LIME_HARFBUZZ" value="1" unless="winrt" />
<!-- <set name="LIME_HASHLINK" value="1" if="windows || mac || linux" /> -->
<set name="LIME_HARFBUZZ" value="1" />
<set name="LIME_HASHLINK" value="1" if="hashlink" />
<set name="LIME_LZMA" value="1" />
<set name="LIME_MBEDTLS" value="1" unless="emscripten || winrt" />
<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
<set name="LIME_MBEDTLS" value="1" unless="emscripten" />
<set name="LIME_OGG" value="1" />

<set name="LIME_OPENALSOFT" value="1" if="windows || linux || mac || android || iphone" unless="tvos" />
<set name="LIME_OPENAL" value="1" if="webassembly || tvos" />
<set name="LIME_MOJOAL" value="1" if="switch || static_link || winrt || mojoal" unless="LIME_OPENAL || iphone LIME_OPENALSOFT" />
<set name="LIME_MOJOAL" value="1" if="static_link || mojoal" unless="LIME_OPENAL || iphone LIME_OPENALSOFT" />
<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
<set name="LIME_OPENAL" value="1" if="LIME_OPENALSOFT" />
<set name="LIME_OPENAL" value="1" if="LIME_MOJOAL" />

<set name="LIME_OPENGL" value="1" />
<set name="LIME_GLAD" value="1" if="LIME_OPENGL" unless="ios || tvos" />
<set name="LIME_PIXMAN" value="1" />
<set name="LIME_PNG" value="1" />
<set name="LIME_SDL" value="1" />
<set name="LIME_VORBIS" value="1" />
<!-- <set name="LIME_VPX" value="1" />
<set name="LIME_WEBM" value="1" /> -->
<set name="LIME_ZLIB" value="1" />

<set name="OUTPUT_DIR" value="../ndll" unless="OUTPUT_DIR" />
<set name="NATIVE_TOOLKIT_PATH" value="lib" unless="NATIVE_TOOLKIT_PATH" />

<set name="NATIVE_TOOLKIT_HAVE_CAIRO" value="1" if="LIME_CAIRO" />
Expand Down Expand Up @@ -92,15 +88,6 @@

</section>

<section if="LIME_FAUDIO">

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

<!-- <file name="src/graphics/format/PNG.cpp" /> -->

</section>

<section if="LIME_FREETYPE">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/include" />
Expand Down Expand Up @@ -158,15 +145,6 @@

</section>

<section if="LIME_NEKO">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/neko/vm/" />
<compilerflag value="-DLIME_NEKO" />

<file name="src/vm/NekoVM.cpp" />

</section>

<section if="LIME_OGG">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/ogg/include/" />
Expand Down Expand Up @@ -202,7 +180,7 @@
</section>

<compilerflag value="-DLIME_OPENGL_GL" if="windows || mac || linux" />
<compilerflag value="-DLIME_OPENGL_GLES2" if="android || rpi || emscripten || tizen || ios || tvos" />
<compilerflag value="-DLIME_OPENGL_GLES2" if="android || rpi || emscripten || ios || tvos" />
<compilerflag value="-DLIME_OPENGL" />

<file name="src/graphics/opengl/OpenGLBindings.cpp" />
Expand Down Expand Up @@ -232,14 +210,6 @@
<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="-DHAVE_LIBC" />

</section>

Expand All @@ -262,7 +232,6 @@
<compilerflag value="-D__IPHONEOS__" if="ios || tvos" />
<compilerflag value="-D__APPLETVOS__" if="tvos" />
<compilerflag value="-DAPPLETV" if="tvos" />
<compilerflag value="-DHAVE_STDIO_H" unless="windows" />

<file name="src/backend/sdl/SDLApplication.cpp" />
<file name="src/backend/sdl/SDLGamepad.cpp" />
Expand Down Expand Up @@ -299,7 +268,6 @@
<file name="src/graphics/ImageBuffer.cpp" />
<file name="src/graphics/RenderEvent.cpp" />
<file name="src/graphics/utils/ImageDataUtil.cpp" />
<file name="src/hx/CFFIExt.cpp" />
<file name="src/math/ColorMatrix.cpp" />
<file name="src/math/Matrix3.cpp" />
<file name="src/math/Rectangle.cpp" />
Expand Down Expand Up @@ -332,38 +300,25 @@

</files>

<files id="android-cpufeatures">

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

</files>
<!-- Run setup now so the submodule projects can determine whether clang or GCC will be used. -->
<!-- TODO: if https://github.com/HaxeFoundation/hxcpp/issues/930 ever gets resolved, use that instead. -->
<setup name="androidNdk" if="android" />

<include name="lib/cairo-files.xml" />
<include name="lib/curl-files.xml" />
<include name="lib/efsw-files.xml" />
<include name="lib/faudio-files.xml" if="LIME_FAUDIO" />
<include name="lib/freetype-files.xml" />
<include name="lib/harfbuzz-files.xml" />
<include name="lib/glad-files.xml" />
<include name="lib/jpeg-files.xml" />
<include name="lib/lzma-files.xml" />
<include name="lib/mbedtls-files.xml" />
<include name="lib/mojoal-files.xml" />
<include name="lib/neko-files.xml" />
<include name="lib/ogg-files.xml" />
<include name="lib/openal-files.xml" />
<include name="lib/pixman-files.xml" />
<include name="lib/png-files.xml" />
<include name="lib/sdl-files.xml" />
<include name="lib/vorbis-files.xml" />
<include name="lib/vpx-files.xml" />
<include name="lib/webm-files.xml" />
<include name="lib/zlib-files.xml" />

<set name="OUTPUT_DIR" value="../ndll" unless="OUTPUT_DIR" />
<set name="DEBUGEXTRA" value="-debug" if="fulldebug" />
<set name="LIBSUFFIX" value="${HX_TARGET_SUFFIX}" if="HX_TARGET_SUFFIX" />
<set name="LIBSUFFIX" value="${LIBEXTRA}" unless="LIBSUFFIX" />
Expand All @@ -373,71 +328,56 @@
<outdir name="${OUTPUT_DIR}/${BINDIR}" />

<files id="lime" />
<files id="android-cpufeatures" if="android" />

<files id="native-toolkit-cairo" if="LIME_CAIRO" />
<files id="native-toolkit-curl" if="LIME_CURL" />
<files id="native-toolkit-efsw" if="LIME_EFSW" />
<files id="native-toolkit-faudio" if="LIME_FAUDIO" />
<files id="native-toolkit-freetype" if="LIME_FREETYPE" />
<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
<files id="native-toolkit-jpeg" if="LIME_JPEG" />
<files id="native-toolkit-lzma" if="LIME_LZMA" />
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
<files id="native-toolkit-mojoal" if="LIME_MOJOAL" />
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-ogg" if="LIME_OGG" />
<files id="native-toolkit-openal" if="LIME_OPENALSOFT" />
<files id="native-toolkit-pixman" if="LIME_PIXMAN" />
<files id="native-toolkit-png" if="LIME_PNG" />
<files id="native-toolkit-sdl" if="LIME_SDL" unless="emscripten" />
<files id="native-toolkit-glad" if="LIME_GLAD" />
<files id="native-toolkit-vorbis" if="LIME_VORBIS" />
<files id="native-toolkit-vpx" if="LIME_VPX" />
<files id="native-toolkit-webm" if="LIME_WEBM" />
<files id="native-toolkit-zlib" if="LIME_ZLIB" />

<section unless="static_link">

<ext value=".so" />
<ext value=".ndll" if="windows || mac || linux" />

<!-- TODO: Support single binary -->
<ext value=".hdll" if="LIME_HASHLINK" />

<section if="windows">

<lib name="gdi32.lib" />
<lib name="opengl32.lib" />
<lib name="user32.lib" />
<lib name="kernel32.lib" />
<lib name="advapi32.lib" />
<lib name="winmm.lib" />
<lib name="avrt.lib" />
<lib name="comdlg32.lib" />
<lib name="comsuppw.lib" />
<lib name="dwrite.lib" />
<lib name="gdi32.lib" />
<lib name="imm32.lib" />
<lib name="kernel32.lib" />
<lib name="ole32.lib" />
<lib name="oleaut32.lib" />
<lib name="opengl32.lib" />
<lib name="rpcrt4.lib" />
<lib name="setupapi.lib" />
<lib name="shell32.lib" />
<lib name="user32.lib" />
<lib name="usp10.lib" />
<lib name="version.lib" />
<lib name="ws2_32.lib" />
<lib name="winmm.lib" />
<lib name="wldap32.lib" />
<lib name="shell32.lib" />
<lib name="comdlg32.lib" />
<lib name="setupapi.lib" />
<lib name="avrt.lib" if="LIME_OPENALSOFT"/>

<lib name="usp10.lib" if="LIME_HARFBUZZ" />
<lib name="rpcrt4.lib" if="LIME_HARFBUZZ" />
<lib name="dwrite.lib" if="LIME_HARFBUZZ" />

<lib name="comsuppw.lib" unless="winrt" />

<lib name="D3D11.lib" if="winrt" />
<lib name="RuntimeObject.lib" if="winrt" />
<lib name="Xinput.lib" if="winrt" />
<lib name="DXGI.lib" if="winrt" />
<lib name="ws2_32.lib" />

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

</section>

Expand All @@ -446,20 +386,13 @@
<lib name="-lpthread" />
<lib name="-lrt" />

<lib name="-lgc" if="LIME_NEKO" />
<lib name="-lm" if="LIME_NEKO" />

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

</section>

<section if="mac">
<vflag name="-install_name" value="@executable_path/lime.hdll" if="LIME_HASHLINK"/>
<!--
starting in xcode 15, rpath doesn't automatically include
/usr/local/lib, but we need it for neko
-->
<vflag name="-rpath" value="/usr/local/lib" />
<vflag name="-rpath" value="/opt/homebrew/lib" if="HXCPP_ARM64"/>

Expand All @@ -483,9 +416,6 @@
<vflag name="-framework" value="SystemConfiguration" />
<vflag name="-framework" value="UniformTypeIdentifiers" />

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

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

Expand Down
Loading