Commit Graph

290 Commits

Author SHA1 Message Date
halx99 cc9cbcbff9 Merge: eba7fc17ba 6bbdc273f8
Merge branch 'main' into dev
2023-08-10 18:53:35 +08:00
halx99 46ed10dac3 Update yasio to v4.1.0 2023-08-10 18:36:45 +08:00
halx99 1ec408812f Fix cmake setup 2023-08-09 14:37:43 +08:00
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 30306ad316 Delete glsl-optimizer due to new shader workflow only require offline tool glslcc 2023-08-01 12:12:10 +08:00
Deal(涓€绾跨伒) 82a40314c9 Remove migrate source inseted by axmol-migrate:
https://github.com/axmolengine/axmol-migrate
2023-07-07 20:51:04 +08:00
halx99 acc47b3281 Bump 1.1.0 2023-07-06 20:37:59 +08:00
halx99 94b5705bd3 Improve cmake script
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
2023-07-06 19:21:36 +08:00
halx99 0aef470146 Migrate setup.py to setup.ps1 2023-07-06 12:18:33 +08:00
halx99 1ba0d44449 Update yasio to 4.0.0 2023-07-05 20:22:11 +08:00
halx99 781b7895a3 Fix build options parsing 2023-07-04 09:23:07 +08:00
halx99 8a0f5c9984 Add build1k:assembleDebug support for android 2023-07-04 09:20:56 +08:00
halx99 5eebb206df Improve ci scripts 2023-07-03 20:01:56 +08:00
Deal(涓€绾跨伒) 6b08dc4430 Update build1k.ps1 2023-07-02 21:23:56 +08:00
halx99 3c5dd9541c Remove test code 2023-07-02 10:51:07 +08:00
halx99 ec77242c6c Fix version match 2023-07-02 10:48:59 +08:00
halx99 bb19133d58 Add clang setup 2023-07-02 10:23:12 +08:00
halx99 53700168d6 Add missing -winsdk option 2023-07-02 10:04:00 +08:00
halx99 b30744d2e0 Fix nuget setup & improve source migrate 2023-07-02 01:01:46 +08:00
Deal(涓€绾跨伒) 9ec338e663 Improve build1k.ps1 (#1251) 2023-07-02 00:53:41 +08:00
Deal(涓€绾跨伒) 2ff94f287e Improve ci files (#1247)
* Improve ci files

* Fixup

* Fix ci

* Update DevSetup.md

* Remove duplicated code

* Fix setup_jdk

* Fix typo

* Check jdk setup

* Update build1k.ps1

* Update build.ps1

* Update build1k.ps1
2023-07-01 08:52:14 +08:00
halx99 6dc5e3a3e3 Fix typo 2023-06-30 17:26:24 +08:00
halx99 ab6ae71691 Fix ci 2023-06-30 17:20:00 +08:00
halx99 ac3123bdb6 Improve ci pwsh script
- Rename tools/ci/build.ps1 to tools/ci/build1k.ps1
- build1k.ps1 now also setup jdk for build android
- Rename `-cm` to `-xc`
- Rename `-cb` to `-xb`
- Add option `-prefix` to specific install location for missing tools,
default localtion is $HOME/build1k/
2023-06-30 17:06:33 +08:00
Deal(涓€绾跨伒) 8a981d7242 Almost pwsh for ci (#1244) 2023-06-29 19:46:52 +08:00
halx99 0a4c247dd2 Migrate sync [skip ci] 2023-06-19 20:09:58 +08:00
Deal(涓€绾跨伒) 145492ae1d Update generate_docs.sh 2023-06-13 20:38:26 +08:00
Deal(涓€绾跨伒) 50e4a82245 Update generate_docs.sh 2023-06-12 12:24:35 +08:00
halx99 20e2a7edcf Fix docs gen 2023-06-12 11:02:17 +08:00
halx99 5612482744 Improve docs gen and fix genbindings 2023-06-12 10:26:08 +08:00
halx99 85111a4cc3 Improve engine version definitions 2023-06-12 09:14:23 +08:00
halx99 448d03f0d2 Improve sources-migrate [skip ci] 2023-06-11 17:48:29 +08:00
halx99 7194dd4de8 Improve sources-migrate [skip ci] 2023-06-11 15:35:18 +08:00
halx99 b13a5a4aab Improve sources-migrate [skip ci]
- support migrate specific folder
2023-06-11 15:31:16 +08:00
halx99 2d81db7869 Fix lua bindings 2023-06-11 15:07:31 +08:00
halx99 3a3881ae93 Improve sources-migrate 2023-06-11 14:38:54 +08:00
halx99 279b635405 Fix genbindings 2023-06-11 14:38:34 +08:00
Deal(涓€绾跨伒) abd8029f64 Remove CC prefix from code file name (#1230)
* Add migrate sources tool

* Fix include replace regex

* Fix compile

* Migrate maually

* Disable sources-migrate tool by default

* Fix ci

* Fix ci

* Improve source migrate

* Fix ios/tvos ci

* Fix ios/tvos ci

* Fix
2023-06-11 13:08:08 +08:00
Deal(涓€绾跨伒) bc82034ffd Improve media-engine for android, linux (#1228)
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme

* Fix ci

* Improve code style

* Improve

* Update VlcMediaEngine.cpp

* Update AvfMediaEngine.h

* Fix ci

* Improve code style

* Enable androidx gradle.properties [skip ci]

* Improve code style

* Remove unnecessary callbacks

* Rename VideoPlayer to MediaPlayer
2023-06-10 22:05:49 +08:00
halx99 4ea68dd804 [CI] Only build cpp-tests for android 2023-06-06 10:33:00 +08:00
Deal(涓€绾跨伒) 9f98262e10 Update VERSION.txt 2023-05-30 10:19:09 +08:00
halx99 3e9f9317b8 Fix win-ci/build.ps1 for x86 build 2023-04-20 08:11:14 +08:00
halx99 72251dcf86 Improve build.ps1 script 2023-04-02 21:34:45 +08:00
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159)
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
2023-04-02 16:04:19 +08:00
halx99 9b381c8fb2 Fix #1157 2023-04-02 09:27:56 +08:00
Deal(涓€绾跨伒) b860217be0 Fix #1156 2023-04-02 01:41:00 +08:00
halx99 4494bd2431 Fix #1155 2023-04-02 00:26:03 +08:00
bwaiox 0d812e09ff Fix lua warnning (#1151)
* Update CMakeLists.txt

fix tmpnam warnning in loslib.c

* Update utils.py

fix error "File "/axmol/tools/console/bin/axmol.py", line 1091, in <module>" when command "axmol new " was used
2023-04-01 17:31:13 +08:00
Deal(涓€绾跨伒) 1e6e9d4a8d Media engine video texture (#1133)
* VideoPlayer based on new MediaEngine[Win32/UWP]

* Improve MediaEngine interface

* Update readme

* Improve pixel format

* Improve MediaEngine interface

* Ready for PR UWP/Win32

* Ready for PR UWP,Win32

* Update reademe files

* Update readme files

* Update UIVideoPlayer-android.cpp [skip ci]

* Update UIVideoPlayer-ios.mm

* Update MFUtils.cpp

* Fix ci
2023-03-25 08:37:51 +08:00
Deal(涓€绾跨伒) 9720265ba6 Update update-prebuilts.ps1 2023-03-21 21:21:02 +08:00