Skip to content

Commit 0923f9f

Browse files
pandamicropandamicro
committed
Merge pull request cocos2d#1555 from MSOpenTech/develop-winrt
Added support for Windows 8.1 Universal Apps (Store and Phone)
2 parents b282b57 + 32d03db commit 0923f9f

File tree

317 files changed

+77481
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+77481
-27
lines changed

‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Thumbs.db
77
*.pdb
88
*.aps
99
*.vcproj.*.user
10+
*.vcxproj.user
1011
*.vspscc
1112
*_i.c
1213
*.i
@@ -32,6 +33,11 @@ _ReSharper*/
3233
[Tt]est[Rr]esult*
3334
ipch/
3435
*.opensdf
36+
Generated Files
37+
AppPackages
38+
39+
# Ignore zip file created by download-deps.py if saved by user
40+
*-deps-*.zip
3541

3642
# Ignore files build by ndk and eclipse
3743
libs/

‎build/cocos2d-jsb-samples-win8.1-universal.sln

+264
Large diffs are not rendered by default.

‎frameworks/js-bindings/bindings/manual/ScriptingCore.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "jsb_cocos2dx_auto.hpp"
3535
#include "js_bindings_config.h"
3636
// for debug socket
37-
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
37+
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
3838
#include <io.h>
3939
#include <WS2tcpip.h>
4040
#else
@@ -105,7 +105,7 @@ static std::unordered_map<std::string, JSObject*> globals;
105105

106106
static void cc_closesocket(int fd)
107107
{
108-
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
108+
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
109109
closesocket(fd);
110110
#else
111111
close(fd);
@@ -351,6 +351,8 @@ bool JSBCore_os(JSContext *cx, uint32_t argc, jsval *vp)
351351
os = JS_InternString(cx, "OS X");
352352
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
353353
os = JS_InternString(cx, "WP8");
354+
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
355+
os = JS_InternString(cx, "WINRT");
354356
#else
355357
os = JS_InternString(cx, "Unknown");
356358
#endif
@@ -1657,7 +1659,7 @@ static void serverEntryPoint(unsigned int port)
16571659

16581660
int err = 0;
16591661

1660-
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
1662+
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
16611663
WSADATA wsaData;
16621664
err = WSAStartup(MAKEWORD(2, 2),&wsaData);
16631665
#endif

‎frameworks/js-bindings/bindings/proj.win8.1-universal/libJSBinding.sln

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libJSBinding", "libJSBinding", "{93494B3A-2760-42B3-BAA1-4A600A53EEDB}"
7+
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding.Shared", "libJSBinding\libJSBinding.Shared\libJSBinding.Shared.vcxitems", "{BEA66276-51DD-4C53-92A8-F3D1FEA50892}"
9+
EndProject
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding.Windows", "libJSBinding\libJSBinding.Windows\libJSBinding.Windows.vcxproj", "{BCF5546D-66A0-4998-AFD6-C5514F618930}"
11+
EndProject
12+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding.WindowsPhone", "libJSBinding\libJSBinding.WindowsPhone\libJSBinding.WindowsPhone.vcxproj", "{CA082EC4-17CE-430B-8207-D1E947A5D1E9}"
13+
EndProject
14+
Global
15+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
16+
libJSBinding\libJSBinding.Shared\libJSBinding.Shared.vcxitems*{ca082ec4-17ce-430b-8207-d1e947a5d1e9}*SharedItemsImports = 4
17+
libJSBinding\libJSBinding.Shared\libJSBinding.Shared.vcxitems*{bea66276-51dd-4c53-92a8-f3d1fea50892}*SharedItemsImports = 9
18+
libJSBinding\libJSBinding.Shared\libJSBinding.Shared.vcxitems*{bcf5546d-66a0-4998-afd6-c5514f618930}*SharedItemsImports = 4
19+
EndGlobalSection
20+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21+
Debug|ARM = Debug|ARM
22+
Debug|Win32 = Debug|Win32
23+
Debug|x64 = Debug|x64
24+
Release|ARM = Release|ARM
25+
Release|Win32 = Release|Win32
26+
Release|x64 = Release|x64
27+
EndGlobalSection
28+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|ARM.ActiveCfg = Debug|ARM
30+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|ARM.Build.0 = Debug|ARM
31+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|Win32.ActiveCfg = Debug|Win32
32+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|Win32.Build.0 = Debug|Win32
33+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|x64.ActiveCfg = Debug|x64
34+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|x64.Build.0 = Debug|x64
35+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|ARM.ActiveCfg = Release|ARM
36+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|ARM.Build.0 = Release|ARM
37+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|Win32.ActiveCfg = Release|Win32
38+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|Win32.Build.0 = Release|Win32
39+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|x64.ActiveCfg = Release|x64
40+
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|x64.Build.0 = Release|x64
41+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|ARM.ActiveCfg = Debug|ARM
42+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|ARM.Build.0 = Debug|ARM
43+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|Win32.ActiveCfg = Debug|Win32
44+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|Win32.Build.0 = Debug|Win32
45+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|x64.ActiveCfg = Debug|Win32
46+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|ARM.ActiveCfg = Release|ARM
47+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|ARM.Build.0 = Release|ARM
48+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.ActiveCfg = Release|Win32
49+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.Build.0 = Release|Win32
50+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|x64.ActiveCfg = Release|Win32
51+
EndGlobalSection
52+
GlobalSection(SolutionProperties) = preSolution
53+
HideSolutionNode = FALSE
54+
EndGlobalSection
55+
GlobalSection(NestedProjects) = preSolution
56+
{BEA66276-51DD-4C53-92A8-F3D1FEA50892} = {93494B3A-2760-42B3-BAA1-4A600A53EEDB}
57+
{BCF5546D-66A0-4998-AFD6-C5514F618930} = {93494B3A-2760-42B3-BAA1-4A600A53EEDB}
58+
{CA082EC4-17CE-430B-8207-D1E947A5D1E9} = {93494B3A-2760-42B3-BAA1-4A600A53EEDB}
59+
EndGlobalSection
60+
EndGlobal

‎frameworks/js-bindings/bindings/proj.win8.1-universal/libJSBinding/libJSBinding.Shared/libJSBinding.Shared.vcxitems

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<ItemsProjectGuid>{bea66276-51dd-4c53-92a8-f3d1fea50892}</ItemsProjectGuid>
7+
<ItemsRootNamespace>libJSBinding</ItemsRootNamespace>
8+
<ItemsProjectName>libJSBinding.Shared</ItemsProjectName>
9+
<CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject>
10+
</PropertyGroup>
11+
<ItemDefinitionGroup>
12+
<ClCompile>
13+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
14+
</ClCompile>
15+
</ItemDefinitionGroup>
16+
<ItemGroup>
17+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_3d_auto.hpp" />
18+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_auto.hpp" />
19+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_builder_auto.hpp" />
20+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_extension_auto.hpp" />
21+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_spine_auto.hpp" />
22+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_studio_auto.hpp" />
23+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_ui_auto.hpp" />
24+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.h" />
25+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes.h" />
26+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes_registration.h" />
27+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions.h" />
28+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions_registration.h" />
29+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_manual.h" />
30+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_registration.h" />
31+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocos2d_specifics.hpp" />
32+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocosbuilder\cocosbuilder_specifics.hpp" />
33+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocosbuilder\js_bindings_ccbreader.h" />
34+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocostudio\jsb_cocos2dx_studio_conversions.h" />
35+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocostudio\jsb_cocos2dx_studio_manual.h" />
36+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\extension\jsb_cocos2dx_extension_manual.h" />
37+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_event_dispatcher_manual.h" />
38+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_helper.h" />
39+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_opengl_functions.h" />
40+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_opengl_manual.h" />
41+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_opengl_registration.h" />
42+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_bindings_config.h" />
43+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_bindings_core.h" />
44+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_bindings_opengl.h" />
45+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_manual_conversions.h" />
46+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\localstorage\js_bindings_system_functions.h" />
47+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\localstorage\js_bindings_system_functions_registration.h" />
48+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\localstorage\js_bindings_system_registration.h" />
49+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\network\jsb_socketio.h" />
50+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\network\jsb_websocket.h" />
51+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\network\XMLHTTPRequest.h" />
52+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\ScriptingCore.h" />
53+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\spidermonkey_specifics.h" />
54+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\spine\jsb_cocos2dx_spine_manual.h" />
55+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\ui\jsb_cocos2dx_ui_manual.h" />
56+
<ClInclude Include="$(MSBuildThisFileDirectory)targetver.h" />
57+
</ItemGroup>
58+
<ItemGroup>
59+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_3d_auto.cpp" />
60+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_auto.cpp" />
61+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_builder_auto.cpp" />
62+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_extension_auto.cpp" />
63+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_spine_auto.cpp" />
64+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_studio_auto.cpp" />
65+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_ui_auto.cpp" />
66+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.cpp" />
67+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes.cpp" />
68+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions.cpp" />
69+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_manual.cpp" />
70+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_registration.cpp" />
71+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocos2d_specifics.cpp" />
72+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocosbuilder\js_bindings_ccbreader.cpp" />
73+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocostudio\jsb_cocos2dx_studio_conversions.cpp" />
74+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocostudio\jsb_cocos2dx_studio_manual.cpp" />
75+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\extension\jsb_cocos2dx_extension_manual.cpp" />
76+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_event_dispatcher_manual.cpp" />
77+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_opengl_functions.cpp" />
78+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_opengl_manual.cpp" />
79+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\jsb_opengl_registration.cpp" />
80+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_bindings_core.cpp" />
81+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_bindings_opengl.cpp" />
82+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_manual_conversions.cpp" />
83+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\localstorage\js_bindings_system_functions.cpp" />
84+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\localstorage\js_bindings_system_registration.cpp" />
85+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\network\jsb_socketio.cpp" />
86+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\network\jsb_websocket.cpp" />
87+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\network\XMLHTTPRequest.cpp" />
88+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\ScriptingCore.cpp" />
89+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\spine\jsb_cocos2dx_spine_manual.cpp" />
90+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\ui\jsb_cocos2dx_ui_manual.cpp" />
91+
</ItemGroup>
92+
<ItemGroup>
93+
<ProjectCapability Include="SourceItemsFromImports" />
94+
</ItemGroup>
95+
<ItemGroup>
96+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_3d_auto_api.js" />
97+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_auto_api.js" />
98+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_builder_auto_api.js" />
99+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_extension_auto_api.js" />
100+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_spine_auto_api.js" />
101+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_studio_auto_api.js" />
102+
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_ui_auto_api.js" />
103+
</ItemGroup>
104+
</Project>

0 commit comments

Comments
 (0)