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

Merge pull request #8638 from ricardoquesada/win_fixes 

compiler fixes for windows
This commit is contained in:
Ricardo Quesada 2014-10-10 18:43:10 -07:00
parent 0a2e60a5ad e03fb86990
commit 159624fce9
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/base/ZipUtils.cpp
View File

@ -22,15 +22,18 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
// FIXME: hack, must be included before ziputils
#include "unzip.h"
#include "base/ZipUtils.h"
#include <zlib.h>
#include <assert.h>
#include <stdlib.h>
#include "base/ZipUtils.h"
#include "base/CCData.h"
#include "base/ccMacros.h"
#include "platform/CCFileUtils.h"
#include "unzip.h"
#include <map>
NS_CC_BEGIN

5
cocos/base/ZipUtils.h
View File

@ -37,6 +37,10 @@ THE SOFTWARE.
#include "platform/CCStdC.h"
#endif
#ifndef _unz64_H
typedef struct unz_file_info_s unz_file_info;
#endif
namespace cocos2d
{
/* XXX: pragma pack ??? */
@ -215,7 +219,6 @@ namespace cocos2d
// forward declaration
class ZipFilePrivate;
struct unz_file_info_s;
typedef struct unz_file_info_s unz_file_info;
/**
* Zip file - reader helper class.

2
cocos/platform/win32/CCApplication-win32.cpp
View File

@ -213,7 +213,7 @@ bool Application::openURL(const std::string &url)
int wchars_num = MultiByteToWideChar(CP_UTF8, 0, url.c_str(), url.size() + 1, temp, url.size() + 1);
HINSTANCE r = ShellExecuteW(NULL, L"open", temp, NULL, NULL, SW_SHOWNORMAL);
delete[] temp;
return (int)r>32;
return (size_t)r>32;
}
void Application::setResourceRootPath(const std::string& rootResDir)