Skip to content
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.

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

Fix Windows 10 compilation #18394

Merged
merged 1 commit into from Oct 23, 2017
Merged

Fix Windows 10 compilation #18394

merged 1 commit into from Oct 23, 2017

Conversation

crazyhappygame
Copy link
Contributor

Old Windows 10 project (create before cocos2d-x.3.16) compile again

@minggo minggo merged commit d06c082 into cocos2d:v3 Oct 23, 2017
@minggo minggo added this to the 3.17 milestone Oct 23, 2017
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Oct 24, 2017
* commit '76ba85adfbb1deedf52162386012afa961c9c016':
  Make cocos' Android.mk self containing (cocos2d#18392) (cocos2d#18393)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18397)
  Fix for Non-TTF Label Shadow, it makes it follow label opacity (cocos2d#18324)
  Remove autorelease mark from UIWebViewWrapper and manage memory manually (cocos2d#18391)
  Corrected bugs with cursor in TextField (cocos2d#18371)
  Fix Windows 10 compilation (cocos2d#18394)

# Conflicts:
#	cocos/base/ccConfig.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants