Commit Graph

345 Commits

Author SHA1 Message Date
Sasha Szpakowski 4a512be715 update freetype to 2.13.2. 2024-02-19 12:30:17 -04:00
Miku AuahDark 2071a685a1 Android: Recompile LuaJIT binaries with NDK 26.1.10909125. 2024-01-27 00:03:53 +08:00
Sasha Szpakowski 17eb2fe045 Merge branch 'main' into 12.x 2023-12-02 14:18:28 -04:00
Sasha Szpakowski 48811d08a8 Update SDL2 to 2.28.5 11.5 2023-12-02 14:16:23 -04:00
Sasha Szpakowski 3b08388623 Update LuaJIT to commit 43d0a19 2023-12-02 14:08:32 -04:00
Sasha Szpakowski da21872b01 Merge branch 'main' into 12.x 2023-10-22 21:24:37 -03:00
Sasha Szpakowski e1343726a1 Update SDL to 2.28.4. 2023-10-22 21:23:46 -03:00
Sasha Szpakowski 69d3c41bfc Update LuaJIT to commit e826d0c 2023-10-22 21:15:55 -03:00
Miku AuahDark 44ba332ebe Rebuild LuaJIT and update LuaJIT build script.
* Clang for Windows is no longer required. Instead it requires GCC + multilib in the WSL distro.
* It will try to use Windows's installed LuaJIT, then fallback to WSL's LuaJIT. If none is found, an error will be thrown.
* Add luajit.h include file as byproducts.
2023-09-28 15:27:46 +08:00
Miku AuahDark 8bca5c43a6 Fix Android compile error.
Cherry-picked from harfbuzz/harfbuzz@d88269c.
2023-09-28 14:31:04 +08:00
Sasha Szpakowski 84a7cbb396 Merge branch 'main' into 12.x 2023-09-10 19:02:15 -03:00
Sasha Szpakowski b75ae16560 update LuaJIT to the latest commit (5a18d45) 2023-09-10 19:02:01 -03:00
Sasha Szpakowski 400e132eb5 Merge branch 'main' into 12.x 2023-08-31 22:54:39 -03:00
Sasha Szpakowski e7e82e2da5 Update LuaJIT to commit 72efc42 2023-08-31 22:51:57 -03:00
Sasha Szpakowski c025bb7422 Update SDL2 version string in megasource build output 2023-08-31 22:23:01 -03:00
Sasha Szpakowski 417464259d Reapply megasource changes to SDL2's cmakelists.txt 2023-08-31 22:21:22 -03:00
Sasha Szpakowski a82fcdd079 Update SDL2 to version 2.28.1. 2023-08-31 22:21:03 -03:00
Sasha Szpakowski e650bfa0bd update LuaJIT to latest commit (72efc42) 2023-08-12 23:59:01 -03:00
Sasha Szpakowski 9c3769338c Update SDL2 version string in megasource build output 2023-07-01 17:33:54 -03:00
Sasha Szpakowski e7dcc1a3a0 Reapply megasource changes to SDL2's cmakelists.txt 2023-07-01 17:33:36 -03:00
Sasha Szpakowski b38f57730a Update SDL2 to version 2.28.1. 2023-07-01 17:33:01 -03:00
Miku AuahDark ac30fb34cb Update LuaJIT to LuaJIT/LuaJIT@224129a8e6.
It's a minor fix from LuaJIT upstream.
2023-05-23 10:29:45 +08:00
Miku AuahDark 1025e7b6e0 Update LuaJIT to LuaJIT/LuaJIT@1c27912705. 2023-04-18 10:46:51 +08:00
Miku AuahDark f587c9d0a8 Update LuaJIT to LuaJIT/LuaJIT@d0e8893 2023-01-30 20:58:40 +08:00
Miku AuahDark 99b2757fc5 Always build LuaJIT amalgamated and with debug information.
Building LuaJIT with "debug" does not increase the size of the binary and
Visual Studio is able to pick correct source files even when LuaJIT is
compiled with amalgamated option.
2023-01-14 15:21:11 +08:00
Miku AuahDark 2ccf2ae9a4 Revert "Updated LuaJIT build command from AuahDark: pass in debug for debug builds, and amalg for release builds."
This reverts commit 915d5a1fb9.
2023-01-14 15:11:43 +08:00
Sasha Szpakowski 7edff04925 Clarify visual studio version use in example build steps. 2023-01-07 12:21:44 -04:00
Sasha Szpakowski acdf3c180f Add readme note about tags and branches 2023-01-01 18:42:20 -04:00
Sasha Szpakowski 2bd51bce60 megasource: add harfbuzz when generating cmake build 2022-12-26 18:54:20 -04:00
Sasha Szpakowski d897f6791d harfbuzz: cmake changes to work with megasource 2022-12-26 18:53:37 -04:00
Sasha Szpakowski 2d13144fcd add harfbuzz library 2022-12-26 18:53:21 -04:00
Miku AuahDark 46a2cbb95d Ensure LuaJIT is GLOBAL target in Android 2022-11-19 17:26:43 +08:00
Miku AuahDark 1dffabf88f Recompile LuaJIT for Android with NDK r25 2022-11-19 17:20:49 +08:00
Miku AuahDark 47bee6ffaa Update LuaJIT to LuaJIT/LuaJIT@7a0cf5f 2022-11-19 17:17:13 +08:00
Miku AuahDark f7f38d3385 Update LuaJIT build script to support NDK r25 2022-11-19 17:13:20 +08:00
Miku AuahDark b77925729f Windows: Workaround ARM64 compilation for now.
Looks like this is no longer needed for next version of SDL, but still needed for 2.24.x
2022-10-16 23:57:23 +08:00
Miku AuahDark 7cf725c4a5 SDL: Fixed missing imports in Android
libsdl-org/SDL@986818143d
2022-08-25 20:13:48 +08:00
Miku AuahDark 259a68c69f Recompile LuaJIT with new commits and soname. 2022-08-25 19:47:18 +08:00
Miku AuahDark ff3a82dc04 Override soname of LuaJIT in Android
love2d/love-android#234
2022-08-25 19:46:29 +08:00
Miku AuahDark f9c81e6353 Merge branch 'main' into 12.x 2022-08-25 19:41:02 +08:00
Miku AuahDark b6b41a6576 Re-apply Megasource-specific CMake patches to zlib. 2022-08-25 19:21:20 +08:00
Miku AuahDark 7fcddc790b Update zlib to 1.2.12 2022-08-25 19:13:08 +08:00
Miku AuahDark 2f06b85a2c Prepare to update zlib to 1.2.12 2022-08-25 18:35:13 +08:00
Miku AuahDark 65e6adcbd1 Update LuaJIT to LuaJIT/LuaJIT@03080b7 2022-08-25 18:33:56 +08:00
Alex Szpakowski 00625e4709 Re-apply megasource changes to SDL's cmake file 2022-07-03 16:48:48 -03:00
Alex Szpakowski 36c71a9403 Update SDL2 to the latest commit (85bbf8e) 2022-07-03 16:47:47 -03:00
Alex Szpakowski 1be9b63e2c Merge branch 'main' into 12.x 2022-06-18 21:45:20 -03:00
Miku AuahDark b9964119f5 Apply OpenAL-soft patch to fix Android audio recording.
kcat/openal-soft@7f1d9725b2
kcat/openal-soft@d7367aeee0
2022-06-18 22:48:23 +08:00
Miku AuahDark 83fd21b130 Fixed indentation from last commit. 2022-06-03 09:01:12 +08:00
Miku AuahDark 54b9fa80a7 Search Oboe in config mode according to kcat/openal-soft@f3092e286e 2022-06-03 08:41:19 +08:00