Commit Graph

21 Commits

Author SHA1 Message Date
minggo f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
qiuguohua eeb9d5c689 Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)
* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>
2021-10-27 10:51:02 +08:00
Yun Hsiao Wu 2056271bac misc pipeline fixes (#3811) 2021-08-10 09:49:18 +08:00
timlyeee b9ed0af4fa Fix glslang errors and Edit-box errors (#3802)
* Update cmake list for dynamic library update

* as glslang and tbb become dynamic library, the cmake should copy dll from glslang folder too.
* "gulp gen simulator" command will automatically generate by user's comupter so sometime it will generate x64 version's simulator. no it's update to  generate Win32 version
* Edit-Box was using wrong parameters GWL_WNDPROC, so x64 version will hit an error. details below:https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra

* small optimize gulp

* change config

* Update cmake list for dynamic library update

* as glslang and tbb become dynamic library, the cmake should copy dll from glslang folder too.
* "gulp gen simulator" command will automatically generate by user's comupter so sometime it will generate x64 version's simulator. no it's update to  generate Win32 version
* Edit-Box was using wrong parameters GWL_WNDPROC, so x64 version will hit an error. details below:https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra

* add glslang header

* Revert "Update cmake list for dynamic library update"

This reverts commit 5eceb132c2411d7e479f6744e33048fabaafe780.

* fix rebase error
2021-08-05 17:22:46 +08:00
timlyeee 723f871bcc update x64 external (#3727) 2021-07-16 11:47:30 +08:00
minggo f6a0c82941 fix conflict 2021-03-15 17:24:16 +08:00
PP e9963878ed fix editBox end editing by pressing return on Win32 / MacOS (#3295) 2021-03-05 11:17:34 +08:00
Yun Hsiao Wu e0fdfef054 license upgrader 2021-02-05 14:08:22 +08:00
minggo 826babfa64 Format code (#3217) 2021-01-13 14:49:32 +08:00
minggo 9d9c79012b change file path (#2733) 2020-09-10 09:51:24 +08:00
minggo b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
minggo 7efee066fd Remove duplicate (#2597) 2020-06-19 11:07:21 +08:00
minggo d381a16142 change namespace from cocos2d to cc (#2572) 2020-06-16 14:34:46 +08:00
Arnold 4945e21a5e 3dgfx win32 refactor, move view-win32 to platform/win32/ (#2320)
* remove View-win32 in templates

* add View-win32.cpp/h

* fix template

* fix template, file path

* remove title
2020-03-23 18:15:54 +08:00
Arnold d3cf38e609 [3d-gfx] win32 fix editbox (#2302) 2020-03-19 14:42:46 +08:00
Arnold ce1cd53386 [gfx] win32 adaptation (#2270)
* update for windows

* update ref location

* update external

* revert debug info

* fix include order

* fix template

* fix buffer

* remove CCStdC-win32*
2020-03-18 11:35:40 +08:00
leda 40731fbcbb free global g_textInputCallback before ScriptEngine clean up (#1576) 2018-10-31 15:12:12 +08:00
minggo 73e0109366 editbox support on windows (#1331) 2018-06-27 11:21:32 +08:00
leda 113ef05feb fix win32 simulator compile/link error, no fix when running (#1326)
* update simulator win

* add libcocos2d depend for simulator

* compile and link success

* update simulator win, add part window control
2018-06-22 17:26:53 +08:00
leda 723f52a472 win32 link/default template compile and link pass, but not works when run (#1321)
* modify file changes on project config

* correct libcocos2d compile

* add win32 props back

* Revert "fix windows link template (#1138)"

This reverts commit 332d95e5b8.

* correct compile error

* many link errors need to be solved

* added part lack methods

* add empty impl for canvas rendering context 2d

* update main.cpp

* correct audio/network compile and link error

* sync win32 application logic with mac

* remove wrong change on application-win32

* correct win32 default-template compile and link error

* win32 simulator part compile error fixed

* editbox define changes
2018-06-22 10:19:31 +08:00