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

fix the define problem

This commit is contained in:
Ray 2015-02-25 14:28:39 +08:00
parent 94523b667a
commit 2f4fbbf4e8
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,6 @@
#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"

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

@ -25,12 +25,6 @@
#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"