diff --git a/cocos2dx/platform/win32/CCEGLView_win32.cpp b/cocos2dx/platform/win32/CCEGLView_win32.cpp
index 0b211863a3..0a9cea49de 100644
--- a/cocos2dx/platform/win32/CCEGLView_win32.cpp
+++ b/cocos2dx/platform/win32/CCEGLView_win32.cpp
@@ -276,7 +276,7 @@ LRESULT CCEGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_LBUTTONDOWN:
if (m_pDelegate && m_pTouch && MK_LBUTTON == wParam)
{
- POINT pt = {LOWORD(lParam), HIWORD(lParam)};
+ POINT pt = {(short)LOWORD(lParam), (short)HIWORD(lParam)};
if (PtInRect(&m_rcViewPort, pt))
{
m_bCaptured = true;
@@ -292,8 +292,8 @@ LRESULT CCEGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_MOUSEMOVE:
if (MK_LBUTTON == wParam && m_bCaptured)
{
- m_pTouch->SetTouchInfo(0, (float)(LOWORD(lParam)- m_rcViewPort.left) / m_fScreenScaleFactor,
- (float)(HIWORD(lParam) - m_rcViewPort.top) / m_fScreenScaleFactor);
+ m_pTouch->SetTouchInfo(0, (float)((short)LOWORD(lParam)- m_rcViewPort.left) / m_fScreenScaleFactor,
+ (float)((short)HIWORD(lParam) - m_rcViewPort.top) / m_fScreenScaleFactor);
m_pDelegate->touchesMoved(m_pSet, NULL);
}
break;
@@ -301,8 +301,8 @@ LRESULT CCEGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_LBUTTONUP:
if (m_bCaptured)
{
- m_pTouch->SetTouchInfo(0, (float)(LOWORD(lParam)- m_rcViewPort.left) / m_fScreenScaleFactor,
- (float)(HIWORD(lParam) - m_rcViewPort.top) / m_fScreenScaleFactor);
+ m_pTouch->SetTouchInfo(0, (float)((short)LOWORD(lParam)- m_rcViewPort.left) / m_fScreenScaleFactor,
+ (float)((short)HIWORD(lParam) - m_rcViewPort.top) / m_fScreenScaleFactor);
m_pDelegate->touchesEnded(m_pSet, NULL);
m_pSet->removeObject(m_pTouch);
ReleaseCapture();
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
index 85e1f58e82..34576c20fb 100644
--- a/cocos2dx/proj.win32/cocos2d-win32.vcxproj
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
@@ -130,6 +130,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
+
@@ -161,6 +162,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
+
@@ -175,8 +177,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
-
-
@@ -193,7 +193,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
-
@@ -218,6 +217,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
+
@@ -310,6 +310,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
+
@@ -326,7 +327,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
-
@@ -338,7 +338,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
-
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
index 2c251241b5..2c871b8e23 100644
--- a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
@@ -52,9 +52,6 @@
{3e1780b2-6a4d-48f0-90ca-e4e0d2613978}
-
- {e1d45f64-9be7-41c5-a657-194780e1b9ea}
-
{022561bf-a9f5-4d03-b3d3-5178fe3ed572}
@@ -219,12 +216,6 @@
platform\win32
-
- platform\win32
-
-
- platform\win32
-
sprite_nodes
@@ -273,9 +264,6 @@
support\zip_support
-
- support\file_support
-
textures
@@ -335,6 +323,12 @@
platform
+
+ platform
+
+
+ cocoa
+
@@ -658,9 +652,6 @@
platform\win32
-
- platform\win32
-
support
@@ -694,9 +685,6 @@
support\zip_support
-
- support\file_support
-
touch_dispatcher
@@ -704,5 +692,11 @@
platform
+
+ platform
+
+
+ cocoa
+
\ No newline at end of file
diff --git a/template/msvc/CCAppWiz.win32/Scripts/1033/default.js b/template/msvc/CCAppWiz.win32/Scripts/1033/default.js
index 4be2f7d513..db2cdd43f8 100644
--- a/template/msvc/CCAppWiz.win32/Scripts/1033/default.js
+++ b/template/msvc/CCAppWiz.win32/Scripts/1033/default.js
@@ -175,8 +175,8 @@ function AddConfigurations(proj, strProjectName) {
var WizardVersion = wizard.FindSymbol('WIZARD_VERSION');
if(WizardVersion >= 10.0) {
- config.OutputDirectory = '$(SolutionDir)$(Configuration).win32'
- config.IntermediateDirectory = '$(Configuration).win32';
+ config.OutputDirectory = '$(SolutionDir)$(Configuration).win32\\'
+ config.IntermediateDirectory = '$(Configuration).win32\\';
} else {
config.OutputDirectory = '$(SolutionDir)$(ConfigurationName).win32'
config.IntermediateDirectory = '$(ConfigurationName).win32';
diff --git a/tests/test.win32/test.win32.vcxproj b/tests/test.win32/test.win32.vcxproj
index f1cf6d71e7..6236be1a6d 100644
--- a/tests/test.win32/test.win32.vcxproj
+++ b/tests/test.win32/test.win32.vcxproj
@@ -112,6 +112,7 @@
+
@@ -178,6 +179,7 @@
+
diff --git a/tests/test.win32/test.win32.vcxproj.filters b/tests/test.win32/test.win32.vcxproj.filters
index 0a554f1e3b..c9b2884f0b 100644
--- a/tests/test.win32/test.win32.vcxproj.filters
+++ b/tests/test.win32/test.win32.vcxproj.filters
@@ -106,6 +106,9 @@
{631af586-68bb-471f-9a8d-d9314cf221db}
+
+ {d84b2f0f-e3c2-46e9-8f5a-c953ced5778a}
+
@@ -300,6 +303,9 @@
classes\tests\PerformanceTest
+
+ classes\tests\ZwoptexTest
+
@@ -557,5 +563,8 @@
classes\tests\PerformanceTest
+
+ classes\tests\ZwoptexTest
+
\ No newline at end of file