Skip to content

Fix visual studio console output #20357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 23, 2019
Merged

Fix visual studio console output #20357

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
30fb96e
Merge pull request #4 from cocos2d/v3
rh101 May 29, 2019
67d2f79
Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
rh101 May 30, 2019
b5bdada
[CCImage-ios.mm] Fixed indentation.
rh101 Jun 4, 2019
7065335
Merge pull request #5 from cocos2d/v3
rh101 Jun 16, 2019
94ec877
Merge pull request #7 from cocos2d/v3
rh101 Jun 22, 2019
92dd2e5
Merge pull request #8 from cocos2d/v3
rh101 Jun 30, 2019
628c758
Merge pull request #9 from cocos2d/v3
rh101 Jul 20, 2019
df5ef30
Merge pull request #10 from cocos2d/v3
rh101 Jul 26, 2019
03c7479
Merge pull request #11 from cocos2d/v3
rh101 Sep 20, 2019
ffc7cc7
Merge pull request #13 from cocos2d/v3
rh101 Sep 23, 2019
5eac99f
Merge pull request #15 from cocos2d/v3
rh101 Nov 6, 2019
d6bdf28
Merge pull request #16 from cocos2d/v3
rh101 Nov 8, 2019
83aab7b
Merge pull request #17 from cocos2d/v3
rh101 Nov 20, 2019
28349b5
Fix for incorrect Visual Studio console output. No line end characte…
rh101 Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cocos/base/CCConsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,10 @@ void log(const char * format, ...)
} while (true);
#if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32
buf[nret] = '\n';
#endif
buf[++nret] = '\0';
#else
buf[nret] = '\0';
#endif

#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
__android_log_print(ANDROID_LOG_DEBUG, "cocos2d-x debug info", "%s", buf);
Expand All @@ -190,6 +192,7 @@ void log(const char * format, ...)

MultiByteToWideChar(CP_UTF8, 0, tempBuf, -1, wszBuf, sizeof(wszBuf));
OutputDebugStringW(wszBuf);
OutputDebugStringW(L"\n");
WideCharToMultiByte(CP_ACP, 0, wszBuf, -1, tempBuf, sizeof(tempBuf), nullptr, FALSE);
#if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32
printf("%s", tempBuf);
Expand Down