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

Merge pull request #7438 from Dhilan007/v3-320final 

disable warn on zero-sized structure[android].
This commit is contained in:
minggo 2014-07-14 21:04:03 +08:00
parent 0ceef253ba 5e10575ab0
commit ff31144bd2
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCFontAtlasCache.cpp
View File

@ -22,11 +22,11 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include <sstream>
#include "2d/CCFontAtlasCache.h" #include "2d/CCFontAtlasCache.h"
#include <iostream>
#include <sstream>
#include "2d/CCFontFNT.h" #include "2d/CCFontFNT.h"
#include "2d/CCFontFreeType.h" #include "2d/CCFontFreeType.h"
#include "CCFontCharMap.h" #include "CCFontCharMap.h"

1
cocos/2d/CCFontAtlasCache.h
View File

@ -26,7 +26,6 @@
#ifndef _CCFontAtlasCache_h_ #ifndef _CCFontAtlasCache_h_
#define _CCFontAtlasCache_h_ #define _CCFontAtlasCache_h_
#include <iostream>
#include <unordered_map> #include <unordered_map>
#include "2d/CCFontAtlas.h" #include "2d/CCFontAtlas.h"

4
cocos/Android.mk
View File

@ -223,9 +223,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
# define the macro to compile through support/zip_support/ioapi.c # define the macro to compile through support/zip_support/ioapi.c
LOCAL_CFLAGS := -DUSE_FILE32API LOCAL_CFLAGS := -DUSE_FILE32API
LOCAL_CPPFLAGS := -Wno-deprecated-declarations LOCAL_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
LOCAL_EXPORT_CFLAGS := -DUSE_FILE32API LOCAL_EXPORT_CFLAGS := -DUSE_FILE32API
LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)