Skip to content

Commit aa66e3a

Browse files
pandamicropandamicro
committed
Merge pull request cocos2d#14629 from MSOpenTech/v3-winrt-3.10
V3.10 winrt updates
2 parents cb22de5 + 908d872 commit aa66e3a

File tree

9 files changed

+24
-23
lines changed

9 files changed

+24
-23
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ _ReSharper*/
3434
[Tt]est[Rr]esult*
3535
ipch/
3636
*.opensdf
37+
*.opendb
3738
SubmissionInfo
3839
Generated Files
3940
AppPackages

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,40 +119,40 @@
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
120120
<GenerateManifest>false</GenerateManifest>
121121
<IgnoreImportLibrary>false</IgnoreImportLibrary>
122-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
122+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
123123
<LinkIncremental>
124124
</LinkIncremental>
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
127127
<GenerateManifest>false</GenerateManifest>
128128
<IgnoreImportLibrary>false</IgnoreImportLibrary>
129-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
129+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
130130
<LinkIncremental>
131131
</LinkIncremental>
132132
</PropertyGroup>
133133
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
134134
<GenerateManifest>false</GenerateManifest>
135135
<IgnoreImportLibrary>false</IgnoreImportLibrary>
136-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
136+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
137137
<LinkIncremental>false</LinkIncremental>
138138
</PropertyGroup>
139139
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
140140
<GenerateManifest>false</GenerateManifest>
141141
<IgnoreImportLibrary>false</IgnoreImportLibrary>
142-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
142+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
143143
<LinkIncremental>false</LinkIncremental>
144144
</PropertyGroup>
145145
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
146146
<GenerateManifest>false</GenerateManifest>
147147
<IgnoreImportLibrary>false</IgnoreImportLibrary>
148-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
148+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
149149
<LinkIncremental>
150150
</LinkIncremental>
151151
</PropertyGroup>
152152
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
153153
<GenerateManifest>false</GenerateManifest>
154154
<IgnoreImportLibrary>false</IgnoreImportLibrary>
155-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
155+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
156156
<LinkIncremental>
157157
</LinkIncremental>
158158
</PropertyGroup>

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<GenerateManifest>false</GenerateManifest>
9393
<IgnoreImportLibrary>false</IgnoreImportLibrary>
94-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
94+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
9595
</PropertyGroup>
9696
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9797
<GenerateManifest>false</GenerateManifest>
9898
<IgnoreImportLibrary>false</IgnoreImportLibrary>
99-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
99+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
100100
</PropertyGroup>
101101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
102102
<GenerateManifest>false</GenerateManifest>
103103
<IgnoreImportLibrary>false</IgnoreImportLibrary>
104-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
104+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
105105
<LinkIncremental>false</LinkIncremental>
106106
</PropertyGroup>
107107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
108108
<GenerateManifest>false</GenerateManifest>
109109
<IgnoreImportLibrary>false</IgnoreImportLibrary>
110-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
110+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
111111
<LinkIncremental>false</LinkIncremental>
112112
</PropertyGroup>
113113
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎cocos/2d/libcocos2d_win10/libcocos2d.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
@@ -1526,34 +1526,34 @@
15261526
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
15271527
<GenerateManifest>false</GenerateManifest>
15281528
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1529-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1529+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15301530
</PropertyGroup>
15311531
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
15321532
<GenerateManifest>false</GenerateManifest>
15331533
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1534-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1534+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15351535
</PropertyGroup>
15361536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
15371537
<GenerateManifest>false</GenerateManifest>
15381538
<IgnoreImportLibrary>false</IgnoreImportLibrary>
15391539
<LinkIncremental>false</LinkIncremental>
1540-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1540+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15411541
</PropertyGroup>
15421542
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
15431543
<GenerateManifest>false</GenerateManifest>
15441544
<IgnoreImportLibrary>false</IgnoreImportLibrary>
15451545
<LinkIncremental>false</LinkIncremental>
1546-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1546+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15471547
</PropertyGroup>
15481548
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
15491549
<GenerateManifest>false</GenerateManifest>
15501550
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1551-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1551+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15521552
</PropertyGroup>
15531553
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
15541554
<GenerateManifest>false</GenerateManifest>
15551555
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1556-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1556+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15571557
</PropertyGroup>
15581558
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
15591559
<ClCompile>
@@ -1675,4 +1675,4 @@
16751675
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
16761676
<ImportGroup Label="ExtensionTargets">
16771677
</ImportGroup>
1678-
</Project>
1678+
</Project>

‎templates/cpp-template-default/proj.win10/App/Cocos2dEngine/OpenGLESPage.xaml.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void OpenGLESPage::CreateRenderSurface()
155155
{
156156
if (mOpenGLES && mRenderSurface == EGL_NO_SURFACE)
157157
{
158-
// The app can configure the the SwapChainPanel which may boost performance.
158+
// The app can configure the SwapChainPanel which may boost performance.
159159
// By default, this template uses the default configuration.
160160
mRenderSurface = mOpenGLES->CreateSurface(swapChainPanel, nullptr, nullptr);
161161

‎templates/cpp-template-default/proj.win8.1-universal/App.Shared/Cocos2dRenderer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Cocos2dRenderer
2929
public:
3030
Cocos2dRenderer(int width, int height, float dpi,
3131
Windows::Graphics::Display::DisplayOrientations orientation,
32-
Windows::UI::Core::CoreDispatcher^ dispathcer, Windows::UI::Xaml::Controls::Panel^ panel);
32+
Windows::UI::Core::CoreDispatcher^ dispatcher, Windows::UI::Xaml::Controls::Panel^ panel);
3333
~Cocos2dRenderer();
3434
void Draw(GLsizei width, GLsizei height, float dpi, Windows::Graphics::Display::DisplayOrientations orientation);
3535
void QueuePointerEvent(cocos2d::PointerEventType type, Windows::UI::Core::PointerEventArgs^ args);

‎templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void OpenGLESPage::CreateRenderSurface()
155155
{
156156
if (mOpenGLES && mRenderSurface == EGL_NO_SURFACE)
157157
{
158-
// The app can configure the the SwapChainPanel which may boost performance.
158+
// The app can configure the SwapChainPanel which may boost performance.
159159
// By default, this template uses the default configuration.
160160
mRenderSurface = mOpenGLES->CreateSurface(swapChainPanel, nullptr, nullptr);
161161

‎templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/Cocos2dRenderer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Cocos2dRenderer
2929
public:
3030
Cocos2dRenderer(int width, int height, float dpi,
3131
Windows::Graphics::Display::DisplayOrientations orientation,
32-
Windows::UI::Core::CoreDispatcher^ dispathcer, Windows::UI::Xaml::Controls::Panel^ panel);
32+
Windows::UI::Core::CoreDispatcher^ dispatcher, Windows::UI::Xaml::Controls::Panel^ panel);
3333
~Cocos2dRenderer();
3434
void Draw(GLsizei width, GLsizei height, float dpi, Windows::Graphics::Display::DisplayOrientations orientation);
3535
void QueuePointerEvent(cocos2d::PointerEventType type, Windows::UI::Core::PointerEventArgs^ args);

‎templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void OpenGLESPage::CreateRenderSurface()
155155
{
156156
if (mOpenGLES && mRenderSurface == EGL_NO_SURFACE)
157157
{
158-
// The app can configure the the SwapChainPanel which may boost performance.
158+
// The app can configure the SwapChainPanel which may boost performance.
159159
// By default, this template uses the default configuration.
160160
mRenderSurface = mOpenGLES->CreateSurface(swapChainPanel, nullptr, nullptr);
161161

0 commit comments

Comments
 (0)