Commit Graph

445 Commits

Author SHA1 Message Date
PatriceJiang 391eae645e fix archive-output-director 2022-04-01 10:31:56 +08:00
minggo c6407256aa
Update CMakeLists.txt 2022-03-31 11:17:49 +08:00
minggo 41cb1f4a5b
fix compiling error with swappy on android 2022-03-31 11:00:17 +08:00
minggo 6a553d5814
Merge pull request #235 from cocos/v3.5
V3.5
2022-03-29 17:19:25 +08:00
Zeqiang Li 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 660df56732
fix ios m1 simulator tbb link error (#232) 2022-03-24 13:45:03 +08:00
Zeqiang Li 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 30393be332
Fix boost link error (#230)
* fix boost link error
2022-03-21 15:13:05 +08:00
mmyduckx 805b07df7e
recompile freetype 2.6.3 for x64/arm64 mac (#229) 2022-03-21 11:00:00 +08:00
minggo 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
李吉林 d2f3382ab5
add freetype (#227) 2022-03-15 17:01:22 +08:00
minggo a1537c3512
Merge pull request #225 from cocos-creator/v3.5
merge V3.5
2022-03-08 14:38:39 +08:00
minggo 4ab24d8bf3
Merge branch 'v3.6' into v3.5 2022-03-08 14:38:27 +08:00
yangchao 349eed9b0b
fix :sdl2 use static link (#224) 2022-02-28 09:45:47 +08:00
yangchao 973e244526
fix : linux use static lib (#223) 2022-02-25 15:32:45 +08:00
yangchao f28eba4d2f
Server mode not link sdl2 (#221) 2022-02-24 14:49:47 +08:00
minggo eddd5fcae3
remove jemalloc and nedmalloc (#222) 2022-02-24 14:45:44 +08:00
wkp 7903ee35a3
feat:Mac support CC_EDITOR V8 config (#219) 2022-02-08 11:10:51 +08:00
wkp 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 5088645437
fix merge error (#220) 2022-02-08 11:00:37 +08:00
bofeng-song 7c33bc6102
fix merge conflict problem(it may cause editor Build failed) (#218) 2022-01-26 17:36:51 +08:00
minggo cd659ed8ff
Merge pull request #216 from cocos-creator/v3.5 2022-01-26 13:56:11 +08:00
minggo 3cb6ea1f12
Merge branch 'v3.6' into v3.5 2022-01-26 13:55:53 +08:00
minggo 8baf780aa5
Merge pull request #215 from cocos-creator/v3.4.2
V3.4.2
2022-01-26 13:49:25 +08:00
wkp 50616c85f9
adapt editor native scene (#214) 2022-01-26 13:45:58 +08:00
Yun Hsiao Wu 937d14d529
better boost source cmake (#213) 2022-01-24 17:47:48 +08:00
bofeng-song 89a9602367
supports to generate editor`s uuid (#212) 2022-01-17 18:18:09 +08:00
yangchao 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 fbef7505d9
mpg123 fix (#210) 2022-01-07 17:33:25 +08:00
minggo 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 995c2a2f02 fix conflict 2022-01-04 15:36:26 +08:00
Zeqiang Li bcdb8327ef
3.4 wgpu wasm (#207) 2021-12-29 16:41:57 +08:00
minggo 59a677f1d3
Merge pull request #206 from minggo/merge_v3.4.0
Merge v3.4.0
2021-12-22 10:40:02 +08:00
minggo a9e9f10f0c merge v3.4 2021-12-22 10:37:56 +08:00
Yun Hsiao Wu 1aac2fcd8d
update boost & add container lib (#204)
* remove boost headers

* boost 1.78
2021-12-16 11:57:40 +08:00
Yun Hsiao Wu a52c3279c3
revert link order adjustment (#201)
The new order will lead to compilation failures when running 32-bit app
on 64-bit devices. /eyerolling
2021-12-16 11:51:30 +08:00
minggo 27fba2b278
Merge pull request #202 from cocos-creator/3d-gfx
3d gfx
2021-12-16 11:50:37 +08:00
江战 7644ec1a9e
Merge pull request #199 from PatriceJiang/v3.4.0-fix-android-compile-every-time
3.4 skip modifying header file of pvmp3dec
2021-12-08 09:40:25 +08:00
PatriceJiang 101f8e780c skip change header file of pvmp3dec 2021-12-08 09:36:41 +08:00
Yun Hsiao Wu 4f972469ff
fix glslang link order (#198) 2021-11-12 11:46:34 +08:00
mmyduckx 7b043c5a76
Add m1 physX support & Stripp PhysX lib for mac/ios/android (#197)
* add M1 arch PhysX & strip & make fatlib

* strip for iOS PhysX

* strip for Android PhysX
2021-11-09 18:06:59 +08:00
timlyeee acbdb6702b
Disable cxx exceptions for spirv-tools (#196)
https://github.com/cocos-creator/3d-tasks/issues/9154
2021-10-21 15:34:42 +08:00
Yun Hsiao Wu 2fc0d39b14
use older pvrvframe library (#195)
which does not suffer from the mandatory multisampled back buffer issue from egl.
2021-10-20 17:25:48 +08:00
timlyeee b13e0d8b6f
Fix ios compile error (#194)
* remove libSPVRemapper dependency
2021-09-30 09:07:12 +08:00
timlyeee 3394d82bd6
Fix x64 websocket issue (#193) 2021-09-28 11:51:56 +08:00
minggo c062a38ab9
merge 3.3.2 (#192)
* Fix issue (#190)

https://github.com/cocos-creator/3d-tasks/issues/9185

* spirv cross for ios 10.0 (#191)

Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>

Co-authored-by: timlyeee <43355299+timlyeee@users.noreply.github.com>
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
2021-09-24 11:48:06 +08:00
timlyeee f7a71ec36a
spirv cross for ios 10.0 (#191)
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
2021-09-17 11:15:54 +08:00
timlyeee 756cbedc19
Fix issue (#190)
https://github.com/cocos-creator/3d-tasks/issues/9185
2021-09-16 10:40:50 +08:00
江战 e3f45c9eb5
Merge pull request #189 from mmyduckx/win32-v8-update
update win32 v8 to 9.1.269
2021-09-14 09:30:28 +08:00
mmyduckx aa94102f24 update win32 v8 to 9.1.269 2021-09-13 20:22:56 +08:00