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

issue #4660: Linux build ok

This commit is contained in:
James Chen 2014-05-08 03:10:16 -07:00
parent 20adf418fd
commit e693a51c6e
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CMakeLists.txt
View File

@ -27,7 +27,7 @@ set(COCOS_2D_PLATFORM_SRC
endif() endif()
include_directories( include_directories(
../external ../external/ConvertUTF
) )

2
cocos/2d/platform/linux/CCFileUtilsLinux.cpp
View File

@ -119,4 +119,4 @@ bool FileUtilsLinux::isFileExistInternal(const std::string& strFilePath) const
NS_CC_END NS_CC_END
#endif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX

1
external/ConvertUTF/ConvertUTF.h vendored
View File

@ -90,6 +90,7 @@
#ifndef LLVM_SUPPORT_CONVERTUTF_H #ifndef LLVM_SUPPORT_CONVERTUTF_H
#define LLVM_SUPPORT_CONVERTUTF_H #define LLVM_SUPPORT_CONVERTUTF_H
#include <stddef.h> /* ptrdiff_t */
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
The following 4 definitions are compiler-specific. The following 4 definitions are compiler-specific.
The C standard does not guarantee that wchar_t has at least The C standard does not guarantee that wchar_t has at least

1
external/ConvertUTF/ConvertUTFWrapper.cpp vendored
View File

@ -12,6 +12,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <assert.h> #include <assert.h>
#include <memory.h>
namespace llvm { namespace llvm {