Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10569 from MSOpenTech/v3-wp8-fix 

fixed conflict with near and far already  defined in windows.h for Win32, WP8 and WinRT
This commit is contained in:
minggo 2015-02-25 09:27:38 +08:00
parent 0d2566c202 b39b078593
commit c460a5bfa4
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp
View File

@ -25,7 +25,14 @@
#include "Node3DReader.h" #include "Node3DReader.h"
#include "cocostudio/CSParseBinary_generated.h" #include "cocostudio/CSParseBinary_generated.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
// conflict with near and far defines in windows.h
#undef near
#undef far
#endif
#include "cocostudio/CSParse3DBinary_generated.h" #include "cocostudio/CSParse3DBinary_generated.h"
#include "cocostudio/FlatBuffersSerialize.h" #include "cocostudio/FlatBuffersSerialize.h"
#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "cocostudio/WidgetReader/NodeReader/NodeReader.h"

7
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
View File

@ -25,7 +25,14 @@
#include "Sprite3DReader.h" #include "Sprite3DReader.h"
#include "cocostudio/CSParseBinary_generated.h" #include "cocostudio/CSParseBinary_generated.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
// conflict with near and far defines in windows.h
#undef near
#undef far
#endif
#include "cocostudio/CSParse3DBinary_generated.h" #include "cocostudio/CSParse3DBinary_generated.h"
#include "cocostudio/FlatBuffersSerialize.h" #include "cocostudio/FlatBuffersSerialize.h"
#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h"