Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,046 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

241 Commits

Author SHA1 Message Date
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 3fd20e30cf Update CocosConfigDefine.cmake 2021-08-27 01:08:14 +08:00
halx99 d59bcadf23 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 64f64f02c9 Update curl to 7.78.0 and use prebuilt lib for speedup cmake generation time 2021-08-23 20:38:52 +08:00
halx99 5b21fe8ce9 Explicit disable codesign for macOS 2021-08-13 10:19:24 +08:00
halx99 1452e698e3 Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 dc3b5292d7 Xcode Embed Frameworks support 
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
 2021-08-10 11:43:16 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 e58472901c Sync CMakeLists.txt and README files [skip ci] 2021-07-08 22:55:33 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 2c5e7c58fb Update name 2021-06-01 20:31:48 +08:00
RH 4e24a8d5a9 Fix for incorrect COCOS_COMMAND path (#357) 2021-05-24 23:15:06 +08:00
halx99 84a8ec8e2e Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 3076a97908 Update ios.mini.cmake 2021-05-14 08:22:46 +08:00
halx99 413b0acaa6 Fix #352 [ci build] 2021-05-12 11:18:31 +08:00
halx99 64a1d68d6f Fix cmake issue [ci build] 
Avoid cause check_include_file return unexpected result.
 2021-05-11 23:48:15 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 7cbfd84f95 Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
halx99 0ef3d6f0e0 Building glfw,freetype,openal,curl from sources [ci build] 2021-04-28 12:43:51 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 327b4717fb Disable luajit compile for release build 2021-02-05 21:59:50 +08:00
halx99 11ca0866e1 Update README.md 2020-12-29 21:48:02 +08:00
halx99 38e4053251 Update README.md 2020-12-29 20:55:12 +08:00
halx99 eb2fcc36b9 fix link error on macOS Big Sur 11.01 
Follow lib removed by Apple
1. /usr/lib/libz.dylib
2. /usr/lib/libiconv.dylib
 2020-12-02 21:59:57 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
halx99 d9fea356fc Since we don't support ios x86 simulator yet, set ios default min deployment target to 9.0 is ok 2020-11-15 21:46:24 -08:00
halx99 dc140c7e5f Update ios.mini.cmake 2020-11-13 11:01:48 +08:00
halx99 fdaed7c349 Update ios.mini.cmake 2020-11-13 01:08:26 +08:00
halx99 00127d3f85 Unify ios min deployment target to 10.0 2020-11-13 01:07:41 +08:00
halx99 8e19969796 Remove print 2020-11-11 22:33:48 -08:00
halx99 9da0c223c6 fix ci for ios [ci build] 2020-11-11 15:07:21 +08:00
halx99 5b3e02edfa fix nasm detect variable CMAKE_ASM_NASM_COMPILER_LOADED not correct [ci build] 2020-11-11 13:51:34 +08:00
halx99 2f5f191ac3 Make nasm compiler optional [ci build] 2020-11-11 13:27:52 +08:00
halx99 0cc9295024 Try enable nasm compiler for libjpeg-turbo boost 2020-11-11 10:31:41 +08:00
halx99 a7c632b3d8 Add compiler flags -mfloat-abi=softfp for android armv7? 2020-11-10 14:36:55 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 b969a163f5 Update cmake build guide [skip appveyor][skip travis] 2020-10-22 17:58:21 +08:00
halx99 cff35a61b8 Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake 2020-10-22 17:50:25 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 0901f1d9eb Build mac with alsoft support (#226) 
* Build mac with alsoft support

* Add missing dep for mac

* Update CocosConfigDepend.cmake
 2020-10-06 20:55:38 +08:00
halx99 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 cca0739793 Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 05d31aa618 Take care PBO use on android 2020-09-15 16:01:44 +08:00
halx99 71db0f3960 CMake: Add missing CC_FORCE_USE_GLES for win 2020-09-15 14:22:19 +08:00
halx99 9e10895b5d Don't config c standard on windows 2020-08-30 13:48:12 +08:00
halx99 da213c9d37 Remove cmake message print 2020-08-29 01:40:55 +08:00
halx99 7acb4e95bf fix #183 2020-08-29 01:39:27 +08:00
halx99 238cd782e3 Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS 2020-08-28 12:57:00 +08:00
halx99 14731e7a5a Merge: f36866a99b 313a2ac09b 
Merge branch 'master' of https://github.com/c4games/engine-x into master
 2020-08-27 17:37:49 +08:00
halx99 7ce3f4ab34 Make logical more clearly 2020-08-27 17:35:30 +08:00
halx99 012e1b0784 Delete ios.toolchain.cmake 
Unused
 2020-08-27 14:12:11 +08:00
halx99 86c70e429b Improve ios CMake scripts 2020-08-24 01:26:12 -07:00
halx99 3b770e4519 Improve engine CMakeLists.txt for ios 
benefit: Now engine can build without ios.toolchain.cmake,
because we solvoe follow issues:
a. fix cmake try_compile failed with arm device without
b. fix try_compile/compile will failed with device on armv7
c. fix thread local storage require:
1. deployment target >= 9.0 (arm64)
2. deployment target == 10.x (armv7)
 2020-08-24 15:31:45 +08:00
aismann 688d12662f Update README.md 
Typo fix
 2020-08-24 09:09:02 +02:00
halx99 92647d1a2f Enable strict try compile by default 
Since we solve try_compile failed with code sign for ios device
 2020-08-22 14:15:22 +08:00
halx99 4c0956d23a Add CXX_STD for cmake to specific c++ standard, c++14,17 should be compile 2020-08-18 11:41:42 +08:00
halx99 10d51d0c22 Update CMake scripts 2020-08-17 19:18:18 +08:00
halx99 2e4499b6d0 Add ios framework required by SDL2, check whether SDL2 support strip it later 2020-08-15 17:47:40 +08:00
halx99 072deafeae Adapte zlib licensed AL library: mojoal 2020-08-14 18:58:44 +08:00
halx99 af8fa43c8c Disable double use in chipmunk_types.h instead CMakeLists.txt more stable for ENGX 2020-08-09 22:41:06 +08:00
halx99 4f081e7aa9 python3 also works for CMake build system 2020-08-05 18:31:24 +08:00
halx99 ec80ebd344 Optimize CMake scripts 2020-08-04 14:05:00 +08:00
halx99 8b9a6bbbf1 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 1e392c9dfe Refine readme [skip appveyor][skip travis] 2020-08-03 19:12:07 +08:00
halx99 3049b8f751 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
halx99 ed91e27c84 fix cmake warnings & cover chipmunk float precision use on apple 2020-07-31 11:56:52 +08:00
halx99 14e090f9bf fix option order 2020-07-31 11:22:42 +08:00
halx99 9345f18159 Add CMAKE option CC_USE_ALSOFT_ON_APPLE to use kcat openal-soft on apple platform, by default currently OFF 2020-07-31 00:06:59 +08:00
halx99 32dc04e27a fix chipmunk float precision mismatch on cmake script 2020-07-29 18:19:23 +08:00
halx99 bfd73bf69a Try cpp14 2020-07-23 00:10:50 +08:00
halx99 e211ac92ea Update cmake toolchain 2020-07-21 23:06:54 +08:00
halx99 690e89b00e Remove a submodules. 2020-07-20 18:41:45 +08:00
halx99 d0a5839439 Use modern gl/gles loader 'glad' to instead 'glew' 2020-02-15 23:51:23 +08:00
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 fcbc5afbb3 Merge: b39b6e9acb cffc332499 
Merge pull request #44 from halx99/master

Fix travis ci ios build issue
 2020-02-07 19:56:34 +08:00
halx99 b2f30327d7 Update ios cmake guide 2020-02-07 19:28:41 +08:00
halx99 209fbae7bf Add ios.toolchain.cmake 2020-02-07 18:59:44 +08:00
halx99 1b34f6a009 Delete FindTinyXML2.cmake 2019-12-02 05:55:34 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00