Merge pull request #4 from MSOpenTech/v2

updated angle to fix memory leak when closing angle
cocos2d · Jun 15, 2014 · 907dc29 · 907dc29
2 parents c18e6e1 + 613443b
commit 907dc29
Show file tree

Hide file tree

Showing 34 changed files with 50 additions and 129 deletions.
diff --git a/cocos2dx/platform/third_party/winrt/angle/angle.bat b/cocos2dx/platform/third_party/winrt/angle/angle.bat
@@ -1,63 +1,110 @@
 set IN_DIR=.\..\..\..\..\..\..\angle\src\WP8\redist\vs2012\ARM\Release
+
 set OUT_DIR=.\..\..\wp8\libraries\arm\
 
+
 xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
 xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
+
 xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
+
 xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%"  /iycq
 
+
+
 set IN_DIR=.\..\..\..\..\..\..\angle\src\WP8\redist\vs2012\Win32\Release
+
 set OUT_DIR=.\..\..\wp8\libraries\x86\
 
+
 xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%"  /iycq
+\
 xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%"  /iycq
 
+
+
 set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2012\ARM\Release
+
 set OUT_DIR=.\..\..\winrt\libraries\vs2012\arm\
 
+
 xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt\libEGL.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt\libEGL.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\esUtil_winrt\esUtil.lib" "%OUT_DIR%"  /iycq
 
+
+
 set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2012\Win32\Release
+
 set OUT_DIR=.\..\..\winrt\libraries\vs2012\Win32\
+
 xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt\libEGL.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt\libEGL.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\esUtil_winrt\esUtil.lib" "%OUT_DIR%"  /iycq
 
+
+
 set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2013\ARM\Release
+
 set OUT_DIR=.\..\..\winrt\libraries\vs2013\arm\
 
+
 xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%"  /iycq
 
+
+
 set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2013\Win32\Release
+
 set OUT_DIR=.\..\..\winrt\libraries\vs2013\Win32\
 
+
 xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%"  /iycq
+
 xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%"  /iycq
 
+
+
 set IN_DIR=.\..\..\..\..\..\..\angle
 
+
 xcopy "%IN_DIR%\include" "include" /eiycq
 
+
 xcopy "%IN_DIR%\src\common\winrtangle.h" "include" /iycq
-xcopy "%IN_DIR%\src\common\winrtangleutils.h" "include" /iycq
-xcopy "%IN_DIR%\src\common\winrtplatform.h" "include" /iycq
-xcopy "%IN_DIR%\src\common\angleutils.h" "include" /iycq
+
 xcopy "%IN_DIR%\samples\gles2_book\Common\esUtil.h" "include" /iycq
 
diff --git a/cocos2dx/platform/third_party/winrt/angle/include/angleutils.h b/cocos2dx/platform/third_party/winrt/angle/include/angleutils.h
diff --git a/cocos2dx/platform/third_party/winrt/angle/include/winrtangleutils.h b/cocos2dx/platform/third_party/winrt/angle/include/winrtangleutils.h
diff --git a/cocos2dx/platform/third_party/winrt/angle/include/winrtplatform.h b/cocos2dx/platform/third_party/winrt/angle/include/winrtplatform.h
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/esUtil.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/esUtil.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libEGL.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libEGL.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libEGL.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libEGL.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libGLESv2.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libGLESv2.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libGLESv2.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2012/ARM/libGLESv2.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/esUtil.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/esUtil.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libEGL.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libEGL.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libEGL.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libEGL.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libGLESv2.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libGLESv2.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libGLESv2.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2012/Win32/libGLESv2.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/esUtil.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/esUtil.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libEGL.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libEGL.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libEGL.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libEGL.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libGLESv2.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libGLESv2.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libGLESv2.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2013/ARM/libGLESv2.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/esUtil.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/esUtil.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libEGL.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libEGL.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libEGL.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libEGL.lib
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libGLESv2.dll b/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libGLESv2.dll
diff --git a/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libGLESv2.lib b/cocos2dx/platform/third_party/winrt/libraries/vs2013/Win32/libGLESv2.lib
diff --git a/cocos2dx/platform/third_party/wp8/libraries/arm/esUtil_phone.lib b/cocos2dx/platform/third_party/wp8/libraries/arm/esUtil_phone.lib
diff --git a/cocos2dx/platform/third_party/wp8/libraries/arm/libEGL_phone.dll b/cocos2dx/platform/third_party/wp8/libraries/arm/libEGL_phone.dll
diff --git a/cocos2dx/platform/third_party/wp8/libraries/arm/libEGL_phone.lib b/cocos2dx/platform/third_party/wp8/libraries/arm/libEGL_phone.lib
diff --git a/cocos2dx/platform/third_party/wp8/libraries/arm/libGLESv2_phone.dll b/cocos2dx/platform/third_party/wp8/libraries/arm/libGLESv2_phone.dll
diff --git a/cocos2dx/platform/third_party/wp8/libraries/arm/libGLESv2_phone.lib b/cocos2dx/platform/third_party/wp8/libraries/arm/libGLESv2_phone.lib
diff --git a/cocos2dx/platform/third_party/wp8/libraries/x86/esUtil_phone.lib b/cocos2dx/platform/third_party/wp8/libraries/x86/esUtil_phone.lib
diff --git a/cocos2dx/platform/third_party/wp8/libraries/x86/libEGL_phone.dll b/cocos2dx/platform/third_party/wp8/libraries/x86/libEGL_phone.dll
diff --git a/cocos2dx/platform/third_party/wp8/libraries/x86/libEGL_phone.lib b/cocos2dx/platform/third_party/wp8/libraries/x86/libEGL_phone.lib
diff --git a/cocos2dx/platform/third_party/wp8/libraries/x86/libGLESv2_phone.dll b/cocos2dx/platform/third_party/wp8/libraries/x86/libGLESv2_phone.dll
diff --git a/cocos2dx/platform/third_party/wp8/libraries/x86/libGLESv2_phone.lib b/cocos2dx/platform/third_party/wp8/libraries/x86/libGLESv2_phone.lib