Commit Graph

366 Commits

Author SHA1 Message Date
smilediver ddeb14c160
Fix shaders not copying to final build on macOS for non Xcode builds (2) (#1908)
* Fix shaders not copying to final build on macOS for non Xcode builds

* Fix macOS build after adding minimum CMake 3.20 requirement

* Refactor "Fix macOS build after adding minimum CMake 3.20 requirement"
2024-05-22 01:51:09 +08:00
halx99 b122a1b96a Fix linking prebuilt error
- Add missing preprocessors
- Use plain name for zlib & png to avoid linking prebuilt axmol error
2024-05-02 20:59:29 +08:00
halx99 d50b7aad0b Improve AXGLSLCC for winrt 2024-05-01 01:16:51 +08:00
halx99 4c59349ac7 Improve cmake scripts 2024-04-30 00:43:54 +08:00
smilediver 354f3abed9
Add ability to create console apps (#1859)
* Print cmake build command when running `axmol build`

* Add option to `ax_setup_app_config()` for building console applications

* Fix console app entrypoint

---------

Co-authored-by: halx99 <halx99@live.com>
2024-04-29 00:24:06 +08:00
RH 3916a2367b
Cross-platform media controller for video playback (#1845)
* Initial work on media controller

* Media player controller for WMF media engine

* Add getDuration and getCurrentTime methods to media engines

* Fix compilation

* Fix Android media timeline issues

* Fix compilation issue

* Fix WinRT compilation issue

* Fix compilation issue

* Add missing header include

* Make it simpler to create a custom media controller

* Ensure the basic media controller widget size is the same size as the media player on initialization

* Add dark media control underlay to give more contrast to the controls
ADd copyright notices

* Removing existing media controller from parent if required

* Adjust for view scaling since embedded resources are created for a scale of 1.

* Scale central media controls if required on content size change

* Remove pointless fast forward and fast reverse buttons
Ensure media controller correctly resizes on full-screen media playback

* Allow enable vlc on windows

* Improve media macro detect

* Add media controls drawn by DrawNode into single texture
Add fullscreen enter and exit controls
setUserInputEnabled and isUserInputEnabled replaced by setMediaControllerEnabled and isMediaControllerEnabled

* Update function calls to new names

* Revert back to setUserInputEnabled and isUserInputEnabled

* Remove embedded circle image and create it with DrawNode

* Change radius of drawn circle to half the total image size

---------

Co-authored-by: halx99 <halx99@live.com>
2024-04-24 22:28:59 +08:00
halx99 1fff0fa746 Add experimental wasm64 support
really experimental, just build, can't run yet
2024-04-12 20:34:59 +08:00
halx99 197f2adfcd Add create isolated project support (#1801)
axmol new HelloCpp -i
2024-04-10 22:11:42 +08:00
Deal 5a03fa2b21
Fix #1805 2024-04-09 23:26:29 +08:00
halx99 e8b070c84c Remove unnecessary cmake option AX_VS_DEPLOYMENT_TARGET since we require cmake >= 3.28 2024-04-03 03:57:59 +08:00
Deal 0957069957
Fix ci 2024-03-30 08:54:21 +08:00
halx99 3ca370525b Explicit link pthread on non-win platforms 2024-03-30 01:42:17 +08:00
halx99 284f088074 Move rpath control to 1k/platforms.cmake 2024-03-30 01:27:13 +08:00
halx99 ab0633ce6e Fix c compiler flags warnings 2024-03-30 01:04:58 +08:00
halx99 6f81d69c01 Merge branch 'dev' of https://github.com/axmolengine/axmol into dev 2024-03-28 20:58:05 +08:00
halx99 62584966af Improve cmake 2024-03-28 20:58:03 +08:00
RH 4fb845244f
Allow certain code modules to be removed from build process (#1769)
* Add support for disabling code sections from build process

* Add support for disabling built-in audio

* No need to add definition here

* Remove extra blank lines

* Add required copyright notice

* Document new options
2024-03-28 10:45:20 +08:00
halx99 d514f88cb1 Fix mac & linux rpath settings 2024-03-27 22:57:32 +08:00
halx99 3555f97a7b Fix ci 2024-03-24 05:20:59 +08:00
halx99 f6061ee1ba Improve build system again 2024-03-23 00:51:46 +08:00
halx99 d1ec623bb5 Rename folder thirdparty ==> 3rdparty 2024-03-19 21:33:02 +08:00
halx99 45d302c49e Disable c++20 char8_t 2024-03-15 21:22:00 +08:00
halx99 4595ab5171 Change default wasm threads to 4 2024-03-11 01:22:07 +08:00
halx99 5e6b865215 Update cppwinrt: 2.0.230706.1 ==> 2.0.240111.5 2024-02-22 20:03:16 +08:00
Deal f22cc4be68
Don't use fmt header only (#1707) 2024-02-20 05:37:28 +08:00
Deal 31da0f2917
Improve dll support (#1706)
* Improve dll support

* Tidy header include path

* Fix android build & symbol dup issue

* Fix android compile error

* Fixup
2024-02-20 05:37:12 +08:00
Deal adbffdf4a2
Fix #1704, control android cmake options by engine axutils.gradle (#1705) 2024-02-20 00:58:47 +08:00
halx99 a3bdfa0724 Fix typo 2024-02-19 14:48:03 +08:00
RH 7f3bf21ee3
Remove duplicate CODE_SIGN_IDENTITY that is setting invalid value (#1666) 2024-02-10 20:15:27 +08:00
RH 7dd7dc4ada
LUA build fix for Android, iOS and Windows (#1650)
* Update paths to lua bindings

* Update target include directories due to new extension dir structure

* Add missing libraries and paths for prebuilt option

* Current FairyGUI requires paths to parent and source directory

* Add required thirdparty search path to LUA library
2024-02-04 22:09:36 +08:00
RH 9f8962d47d
Change extension folder structure to reduce file name conflicts (#1647)
* Restructure extension folder structure to reduce conflicts with project source files

* Do not include SDFGen headers for Android builds

* Ensure correct paths are included for the relevant targets

* ImGui is not be enabled for WinUWP, tvOS and iOS

* Fix LUA auto binding generator to work with updated extension folder structure

* Fix path and linker issues for yasio when using prebuilt option
Set correct paths to extensions for prebuilt option
2024-02-03 10:08:22 +08:00
halx99 df165fec4b Prepare release v2.1.1 2024-02-02 00:00:06 +08:00
halx99 74189ffa24 Slient no shader discovered [skip ci][skip appveyor] 2024-01-25 22:20:04 +08:00
smilediver f90aaec0a9
Fix shaders not copying to final build on macOS for non Xcode builds (#1631) 2024-01-24 21:40:15 +08:00
halx99 83bc0b1de9 Fixup
- Don't build draft pull-request
- Delete update-prebuilts ci, since prebuilts managed by manifest.json
- genbindings now will create a pull-request automatically
- Fix build-site download unexpected artifacts from appveyor
- Fix build win32 with clang error
2024-01-22 21:46:55 +08:00
Deal 9ec7c54c57
release 2.1.0 finally (#1621) [release 2.1.0]
* Delete deprecated prop `buildconfig` from gradle.properties

* Delete unnecessary props since it's value same with defaults

* Don't need config debug keystore, will auto signed by default debug.keystore

* Update funding [skip ci]

* Fix axmol cmdline tool command 'new'

* Refix c99 for winsdk < 10.0.22000.0

* Fix powershell 3 condition statement: 'xxx = if(c) { v1 } else { v2 }' will lost switch parameter semantic

* Improve code style

* Improve code style

* Fixup
2024-01-20 16:16:53 +08:00
halx99 8ee68b58c9 Bump 2.1.0 2024-01-19 20:39:08 +08:00
smilediver 729cc80351
Allow to override AX_USE_COMPAT_GL from user's CMakeLists.txt (#1610) 2024-01-15 23:45:37 +08:00
aismann 00d7b95af0
using AX_EX_DLL (#1578) 2024-01-05 05:35:05 +08:00
RH db2c749c67
Support setting of custom runtime output directory for project (#1574) 2024-01-04 19:35:04 +08:00
halx99 ef7b9859a3 Mark 32bit build deprecated, refer #1570 2024-01-02 21:10:28 +08:00
halx99 a85ef10410 Fix #1558 2023-12-31 22:35:36 +08:00
halx99 22a1faa593 Improve build system 2023-12-22 02:39:38 +08:00
halx99 e62d09a718 Make XCODE_EMBED_RESOURCES match cmake 3.28 release, refer #1482 2023-12-08 23:42:05 +08:00
halx99 affcf05b69 Prepare 2.1.0 release
* Update copyright notice
* Remove prebuilt libs from SCM
* Remove optional thirdparty sources/repo from SCM
* Remove tests resources  folder 'Content' from SCM
2023-12-08 01:04:43 +08:00
Deal 69b55efb82 Remove duplicated libz for ios/tvos (#1455) 2023-11-26 23:13:29 +08:00
axmol-bot 78672f4a19 Update thirdparty prebuilts to v60 (#1446) 2023-11-25 14:47:25 +08:00
Deal b062eb3dc2 Improve linux deps (#1441) 2023-11-19 09:38:12 +08:00
RH 4b5dc59574 Fix for UWP build issues (#1421) 2023-11-08 08:15:40 +08:00
halx99 9a8bab9440 Fix #1388 2023-10-16 20:24:59 +08:00