diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj
index a5e060c98b..e06f7e17a0 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj
+++ b/cocos/2d/cocos2d_wp8.vcxproj
@@ -210,20 +210,22 @@
-
-
-
-
+
+
+
+
+
+
false
false
@@ -560,7 +562,6 @@
-
@@ -617,7 +618,6 @@
-
@@ -698,28 +698,30 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -769,7 +771,6 @@
-
@@ -812,7 +813,6 @@
-
diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters
index 42ed545af3..6427cee862 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj.filters
+++ b/cocos/2d/cocos2d_wp8.vcxproj.filters
@@ -103,6 +103,9 @@
{a36c6808-a8d6-43f4-bfb0-e08ee2747a21}
+
+ {5598fb0c-c012-45b6-8e43-447e7891b61d}
+
@@ -376,7 +379,6 @@
tilemap_parallax_nodes
-
@@ -385,9 +387,6 @@
support
-
- support
-
support
@@ -430,9 +429,6 @@
base
-
- base
-
base
@@ -442,9 +438,6 @@
base
-
- base
-
base
@@ -454,12 +447,6 @@
base
-
- base
-
-
- base
-
support
@@ -611,6 +598,24 @@
xxhash
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
@@ -679,9 +684,6 @@
include
-
- include
-
include
@@ -980,9 +982,6 @@
support
-
- support
-
support
@@ -1034,48 +1033,24 @@
base
-
- base
-
base
-
- base
-
base
base
-
- base
-
-
- base
-
-
- base
-
base
-
- base
-
base
base
-
- base
-
-
- base
-
event_dispatcher
@@ -1239,5 +1214,35 @@
xxhash
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
+
+ deprecated
+
\ No newline at end of file
diff --git a/cocos/2d/cocos2d_wp8_headers.props b/cocos/2d/cocos2d_wp8_headers.props
index 08825273b2..6c5ad09ec1 100644
--- a/cocos/2d/cocos2d_wp8_headers.props
+++ b/cocos/2d/cocos2d_wp8_headers.props
@@ -7,7 +7,7 @@
- $(EngineRoot)cocos\2d\platform\wp8;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\gui;$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)cocos\math\kazmath\include;$(GeneratedFilesDir)
+ $(EngineRoot)cocos\2d\platform\wp8;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\gui;$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)cocos\math\kazmath\include;$(EngineRoot)cocos\deprecated;$(GeneratedFilesDir)
_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
true
diff --git a/cocos/2d/platform/winrt/CCStdC.h b/cocos/2d/platform/winrt/CCStdC.h
index 806802d345..99992001ba 100644
--- a/cocos/2d/platform/winrt/CCStdC.h
+++ b/cocos/2d/platform/winrt/CCStdC.h
@@ -32,11 +32,12 @@ THE SOFTWARE.
#include "CCPlatformMacros.h"
#include
+#include
-//typedef SSIZE_T ssize_t;
-// ssize_t was redefined as int in libwebsockets.h.
-// Therefore, to avoid conflict, we needs the same definition.
-typedef int ssize_t;
+#ifndef __SSIZE_T
+#define __SSIZE_T
+typedef SSIZE_T ssize_t;
+#endif // __SSIZE_T
// for math.h on win32 platform
diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
index a7725a4bfb..167967e312 100644
--- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
+++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
@@ -118,13 +118,13 @@ bool CCEditBoxImplWp8::initWithSize( const Size& size )
void CCEditBoxImplWp8::setFont( const char* pFontName, int fontSize )
{
if(m_pLabel != NULL) {
- m_pLabel->setSystemFontName(pFontName);
- m_pLabel->setSystemFontSize(fontSize);
+ m_pLabel->setFontName(pFontName);
+ m_pLabel->setFontSize(fontSize);
}
if(m_pLabelPlaceHolder != NULL) {
- m_pLabelPlaceHolder->setSystemFontName(pFontName);
- m_pLabelPlaceHolder->setSystemFontSize(fontSize);
+ m_pLabelPlaceHolder->setFontName(pFontName);
+ m_pLabelPlaceHolder->setFontSize(fontSize);
}
}
@@ -137,8 +137,8 @@ void CCEditBoxImplWp8::setFontColor( const Color3B& color )
void CCEditBoxImplWp8::setPlaceholderFont( const char* pFontName, int fontSize )
{
if(m_pLabelPlaceHolder != NULL) {
- m_pLabelPlaceHolder->setSystemFontName(pFontName);
- m_pLabelPlaceHolder->setSystemFontSize(fontSize);
+ m_pLabelPlaceHolder->setFontName(pFontName);
+ m_pLabelPlaceHolder->setFontSize(fontSize);
}
}
diff --git a/external/websockets/include/wp8/libwebsockets.h b/external/websockets/include/wp8/libwebsockets.h
index 2f9349d99f..4f4089d773 100644
--- a/external/websockets/include/wp8/libwebsockets.h
+++ b/external/websockets/include/wp8/libwebsockets.h
@@ -42,7 +42,12 @@ extern "C" {
#define strcasecmp stricmp
#define getdtablesize() 30000
-typedef int ssize_t;
+#include
+
+#ifndef __SSIZE_T
+#define __SSIZE_T
+ typedef SSIZE_T ssize_t;
+#endif // __SSIZE_T
#define LWS_VISIBLE