Skip to content

Commit 907dc29

Browse files
author
minggo
committed
Merge pull request #4 from MSOpenTech/v2
updated angle to fix memory leak when closing angle
2 parents c18e6e1 + 613443b commit 907dc29

34 files changed

+50
-129
lines changed
Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,110 @@
11
set IN_DIR=.\..\..\..\..\..\..\angle\src\WP8\redist\vs2012\ARM\Release
2+
23
set OUT_DIR=.\..\..\wp8\libraries\arm\
34

5+
46
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
57
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
8+
69
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
10+
711
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%" /iycq
12+
813
xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%" /iycq
914

15+
16+
1017
set IN_DIR=.\..\..\..\..\..\..\angle\src\WP8\redist\vs2012\Win32\Release
18+
1119
set OUT_DIR=.\..\..\wp8\libraries\x86\
1220

21+
1322
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
23+
\
1424
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
25+
1526
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
27+
1628
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%" /iycq
29+
1730
xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%" /iycq
1831

32+
33+
1934
set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2012\ARM\Release
35+
2036
set OUT_DIR=.\..\..\winrt\libraries\vs2012\arm\
2137

38+
2239
xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.dll" "%OUT_DIR%" /iycq
40+
2341
xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.lib" "%OUT_DIR%" /iycq
42+
2443
xcopy "%IN_DIR%\libEGL_winrt\libEGL.dll" "%OUT_DIR%" /iycq
44+
2545
xcopy "%IN_DIR%\libEGL_winrt\libEGL.lib" "%OUT_DIR%" /iycq
46+
2647
xcopy "%IN_DIR%\esUtil_winrt\esUtil.lib" "%OUT_DIR%" /iycq
2748

49+
50+
2851
set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2012\Win32\Release
52+
2953
set OUT_DIR=.\..\..\winrt\libraries\vs2012\Win32\
54+
3055
xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.dll" "%OUT_DIR%" /iycq
56+
3157
xcopy "%IN_DIR%\libGLESv2_winrt\libGLESv2.lib" "%OUT_DIR%" /iycq
58+
3259
xcopy "%IN_DIR%\libEGL_winrt\libEGL.dll" "%OUT_DIR%" /iycq
60+
3361
xcopy "%IN_DIR%\libEGL_winrt\libEGL.lib" "%OUT_DIR%" /iycq
62+
3463
xcopy "%IN_DIR%\esUtil_winrt\esUtil.lib" "%OUT_DIR%" /iycq
3564

65+
66+
3667
set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2013\ARM\Release
68+
3769
set OUT_DIR=.\..\..\winrt\libraries\vs2013\arm\
3870

71+
3972
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%" /iycq
73+
4074
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%" /iycq
75+
4176
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%" /iycq
77+
4278
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%" /iycq
79+
4380
xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%" /iycq
4481

82+
83+
4584
set IN_DIR=.\..\..\..\..\..\..\angle\src\WinRT\redist\vs2013\Win32\Release
85+
4686
set OUT_DIR=.\..\..\winrt\libraries\vs2013\Win32\
4787

88+
4889
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%" /iycq
90+
4991
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%" /iycq
92+
5093
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%" /iycq
94+
5195
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%" /iycq
96+
5297
xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%" /iycq
5398

99+
100+
54101
set IN_DIR=.\..\..\..\..\..\..\angle
55102

103+
56104
xcopy "%IN_DIR%\include" "include" /eiycq
57105

106+
58107
xcopy "%IN_DIR%\src\common\winrtangle.h" "include" /iycq
59-
xcopy "%IN_DIR%\src\common\winrtangleutils.h" "include" /iycq
60-
xcopy "%IN_DIR%\src\common\winrtplatform.h" "include" /iycq
61-
xcopy "%IN_DIR%\src\common\angleutils.h" "include" /iycq
108+
62109
xcopy "%IN_DIR%\samples\gles2_book\Common\esUtil.h" "include" /iycq
63110

cocos2dx/platform/third_party/winrt/angle/include/angleutils.h

Lines changed: 0 additions & 56 deletions
This file was deleted.

cocos2dx/platform/third_party/winrt/angle/include/winrtangleutils.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

cocos2dx/platform/third_party/winrt/angle/include/winrtplatform.h

Lines changed: 0 additions & 40 deletions
This file was deleted.
Binary file not shown.
512 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)