minggo
7b0b2bc14e
Merge branch 'v3.5' into v3.6_merge_v3.5
2022-06-07 15:39:40 +08:00
yangchao and GitHub
d576db3d0f
not use this marco on nx windows ( #258 )
...
* not use this marco on nx windows
* nx windows not need this compile options
2022-05-31 17:23:24 +08:00
yangchao and GitHub
40e0ab05b8
V3.5 nx ( #257 )
...
* add nx support
* fix nx external compiler error
* format code
* nx if use nvn, no need use tbb
* windows cl.exe not support -include compile flag
* update pvmp3dec cmake , support windows
2022-05-28 20:10:19 +08:00
bofeng-song and GitHub
9a6b364f70
Fix the problem that Surface size may get wrong after Android backend cut to frontend ( #255 )
2022-05-13 10:16:01 +08:00
timlyeee and GitHub
c90cf22abf
delete win32 libs ( #256 )
2022-05-11 17:43:20 +08:00
minggo and GitHub
a280d3ba6a
Update boost.cmake ( #252 )
2022-04-25 16:12:53 +08:00
minggo and GitHub
8a702477c1
Merge pull request #251 from minggo/merge_v3.5
...
Merge v3.5
2022-04-25 14:06:51 +08:00
minggo
9b3fc71c6d
Merge branch 'revert_v3.5' into merge_v3.5
2022-04-25 14:01:47 +08:00
bofeng-song and GitHub
b0c2516d5b
integrate gamesdk source code ( #248 )
...
* integrate gamesdk source code
* refine
2022-04-19 16:43:33 +08:00
Zeqiang Li and GitHub
ea41ab8f47
conditional compile swappy ( #247 )
2022-04-14 18:12:30 +08:00
bofeng-song and GitHub
dae690a354
fix android build error ( #246 )
2022-04-14 16:08:15 +08:00
Zeqiang Li and GitHub
e5e37407a3
disable swappy by default ( #245 )
2022-04-11 10:54:04 +08:00
江战 and GitHub
9e98579fc3
Merge pull request #244 from PatriceJiang/swappy-ndk-19
...
support ndk 19+
2022-04-08 20:13:32 +08:00
PatriceJiang
ce6c0e8ee2
support ndk 19+
2022-04-08 20:12:22 +08:00
yangchao and GitHub
e0a3e7bc34
mv qnx libs in private repo ( #243 )
2022-04-06 11:00:38 +08:00
minggo and GitHub
705e0e0f59
fix compiling error on android ( #242 )
2022-04-01 13:37:16 +08:00
江战 and GitHub
12edb5dd27
Merge pull request #241 from PatriceJiang/v3.6-fix-boost-container
...
Fix iOS archive error
2022-04-01 13:37:02 +08:00
James Chen and GitHub
53005b48c3
[v3.5] Don't depend on boost_container since it's not necessary ( #240 )
2022-04-01 11:54:59 +08:00
yangchao and GitHub
602a2896ba
V3.6 add freetype ( #239 )
...
* add linux freetype
2022-04-01 10:37:00 +08:00
mmyduckx and GitHub
379c390f7d
upgrade freetype to 2.10.0 for mac/ios/ios-m1-sim/android/win64 ( #231 )
...
* upgrade freetype to 2.10.0 for mac/ios/ios-m1-sim/android
* update version.txt
* add win64 freetype 2.10.0
2022-04-01 10:36:43 +08:00
PatriceJiang
391eae645e
fix archive-output-director
2022-04-01 10:31:56 +08:00
minggo and GitHub
c6407256aa
Update CMakeLists.txt
2022-03-31 11:17:49 +08:00
minggo and GitHub
41cb1f4a5b
fix compiling error with swappy on android
2022-03-31 11:00:17 +08:00
minggo and GitHub
6a553d5814
Merge pull request #235 from cocos/v3.5
...
V3.5
2022-03-29 17:19:25 +08:00
5c20ccbf71
fix crash caused by swappy on android
...
* fix native android crash
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com >
2022-03-24 14:38:07 +08:00
mmyduckx and GitHub
660df56732
fix ios m1 simulator tbb link error ( #232 )
2022-03-24 13:45:03 +08:00
Zeqiang Li and GitHub
bf693c7221
3.5.0 swappy ( #226 )
...
* swappy
* enable swappy macro
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com >
2022-03-22 17:51:40 +08:00
minggo and GitHub
30393be332
Fix boost link error ( #230 )
...
* fix boost link error
2022-03-21 15:13:05 +08:00
mmyduckx and GitHub
805b07df7e
recompile freetype 2.6.3 for x64/arm64 mac ( #229 )
2022-03-21 11:00:00 +08:00
minggo and GitHub
660590ef8a
reame macro X to TREMOLO_X to fix compiling error, X is not a good name ( #228 )
2022-03-18 15:12:12 +08:00
李吉林 and GitHub
d2f3382ab5
add freetype ( #227 )
2022-03-15 17:01:22 +08:00
minggo and GitHub
a1537c3512
Merge pull request #225 from cocos-creator/v3.5
...
merge V3.5
2022-03-08 14:38:39 +08:00
minggo and GitHub
4ab24d8bf3
Merge branch 'v3.6' into v3.5
2022-03-08 14:38:27 +08:00
yangchao and GitHub
349eed9b0b
fix :sdl2 use static link ( #224 )
2022-02-28 09:45:47 +08:00
yangchao and GitHub
973e244526
fix : linux use static lib ( #223 )
2022-02-25 15:32:45 +08:00
yangchao and GitHub
f28eba4d2f
Server mode not link sdl2 ( #221 )
2022-02-24 14:49:47 +08:00
minggo and GitHub
eddd5fcae3
remove jemalloc and nedmalloc ( #222 )
2022-02-24 14:45:44 +08:00
wkp and GitHub
7903ee35a3
feat：Mac support CC_EDITOR V8 config ( #219 )
2022-02-08 11:10:51 +08:00
8e1e22ce0e
refactor v8 config for cc_editor ( #217 )
...
Co-authored-by: minggo <xiaoming.zhang@chukong-inc.com >
2022-02-08 11:10:23 +08:00
Yun Hsiao Wu and GitHub
5088645437
fix merge error ( #220 )
2022-02-08 11:00:37 +08:00
bofeng-song and GitHub
7c33bc6102
fix merge conflict problem(it may cause editor Build failed) ( #218 )
2022-01-26 17:36:51 +08:00
minggo and GitHub
cd659ed8ff
Merge pull request #216 from cocos-creator/v3.5
2022-01-26 13:56:11 +08:00
minggo and GitHub
3cb6ea1f12
Merge branch 'v3.6' into v3.5
2022-01-26 13:55:53 +08:00
minggo and GitHub
8baf780aa5
Merge pull request #215 from cocos-creator/v3.4.2
...
V3.4.2
2022-01-26 13:49:25 +08:00
wkp and GitHub
50616c85f9
adapt editor native scene ( #214 )
2022-01-26 13:45:58 +08:00
Yun Hsiao Wu and GitHub
937d14d529
better boost source cmake ( #213 )
2022-01-24 17:47:48 +08:00
bofeng-song and GitHub
89a9602367
supports to generate editor`s uuid ( #212 )
2022-01-17 18:18:09 +08:00
yangchao and GitHub
613927e7f7
add Linux libs ( #211 )
...
* add linux lib
* add sdl2
* remove files
* new lib dir
* change cmake
* add qnx lib
* add cairo lib
* openssl use 1.1.1k , curl use static link
2022-01-10 11:06:44 +08:00
timlyeee and GitHub
fbef7505d9
mpg123 fix ( #210 )
2022-01-07 17:33:25 +08:00
minggo and GitHub
5d15a6b4f3
Merge pull request #208 from minggo/merge-v3.4.0_native
...
Merge v3.4.0 native
2022-01-04 15:38:38 +08:00
minggo
yangchaoandGitHub
bofeng-songandGitHub
timlyeeeandGitHub
Zeqiang LiandGitHub
江战andGitHub
PatriceJiang
James ChenandGitHub
mmyduckxandGitHub
minggoandGitHub
李吉林andGitHub
wkpandGitHub
Yun Hsiao WuandGitHub
Yun Hsiao WuandGitHub