Skip to content

Commit 7015c40

Browse files
author
James Chen
committed
Updates windows projects.
1 parent 4c22156 commit 7015c40

21 files changed

+1308
-1374
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "tools/cocos2d-console"]
88
path = tools/cocos2d-console
99
url = git://github.com/cocos2d/cocos2d-console.git
10+
[submodule "tools/bindings-generator"]
11+
path = tools/bindings-generator
12+
url = git://github.com/cocos2d/bindings-generator.git

‎jsb/bindings/proj.win32/libJSBinding.vcxproj

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,29 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\..\..\bindings\auto\jsb_cocos2dx_auto.cpp" />
15-
<ClCompile Include="..\cocos2d_specifics.cpp" />
16-
<ClCompile Include="..\jsb_opengl_functions.cpp" />
17-
<ClCompile Include="..\jsb_opengl_manual.cpp" />
18-
<ClCompile Include="..\jsb_opengl_registration.cpp" />
19-
<ClCompile Include="..\js_bindings_core.cpp" />
20-
<ClCompile Include="..\js_bindings_opengl.cpp" />
21-
<ClCompile Include="..\js_manual_conversions.cpp" />
22-
<ClCompile Include="..\ScriptingCore.cpp" />
14+
<ClCompile Include="..\auto\jsb_cocos2dx_auto.cpp" />
15+
<ClCompile Include="..\manual\cocos2d_specifics.cpp" />
16+
<ClCompile Include="..\manual\jsb_opengl_functions.cpp" />
17+
<ClCompile Include="..\manual\jsb_opengl_manual.cpp" />
18+
<ClCompile Include="..\manual\jsb_opengl_registration.cpp" />
19+
<ClCompile Include="..\manual\js_bindings_core.cpp" />
20+
<ClCompile Include="..\manual\js_bindings_opengl.cpp" />
21+
<ClCompile Include="..\manual\js_manual_conversions.cpp" />
22+
<ClCompile Include="..\manual\ScriptingCore.cpp" />
2323
</ItemGroup>
2424
<ItemGroup>
25-
<ClInclude Include="..\..\..\bindings\auto\jsb_cocos2dx_auto.hpp" />
26-
<ClInclude Include="..\cocos2d_specifics.hpp" />
27-
<ClInclude Include="..\jsb_helper.h" />
28-
<ClInclude Include="..\jsb_opengl_functions.h" />
29-
<ClInclude Include="..\jsb_opengl_manual.h" />
30-
<ClInclude Include="..\jsb_opengl_registration.h" />
31-
<ClInclude Include="..\js_bindings_config.h" />
32-
<ClInclude Include="..\js_bindings_core.h" />
33-
<ClInclude Include="..\js_bindings_opengl.h" />
34-
<ClInclude Include="..\js_manual_conversions.h" />
35-
<ClInclude Include="..\ScriptingCore.h" />
36-
<ClInclude Include="..\spidermonkey_specifics.h" />
37-
</ItemGroup>
38-
<ItemGroup>
39-
<None Include="..\..\..\bindings\auto\jsb_cocos2dx_auto_api.js" />
40-
<None Include="..\..\script\jsb.js" />
41-
<None Include="..\..\script\jsb_chipmunk.js" />
42-
<None Include="..\..\script\jsb_cocos2d.js" />
43-
<None Include="..\..\script\jsb_cocos2d_extension.js" />
44-
<None Include="..\..\script\jsb_cocosbuilder.js" />
45-
<None Include="..\..\script\jsb_debugger.js" />
46-
<None Include="..\..\script\jsb_opengl.js" />
47-
<None Include="..\..\script\jsb_sys.js" />
25+
<ClInclude Include="..\auto\jsb_cocos2dx_auto.hpp" />
26+
<ClInclude Include="..\manual\cocos2d_specifics.hpp" />
27+
<ClInclude Include="..\manual\jsb_helper.h" />
28+
<ClInclude Include="..\manual\jsb_opengl_functions.h" />
29+
<ClInclude Include="..\manual\jsb_opengl_manual.h" />
30+
<ClInclude Include="..\manual\jsb_opengl_registration.h" />
31+
<ClInclude Include="..\manual\js_bindings_config.h" />
32+
<ClInclude Include="..\manual\js_bindings_core.h" />
33+
<ClInclude Include="..\manual\js_bindings_opengl.h" />
34+
<ClInclude Include="..\manual\js_manual_conversions.h" />
35+
<ClInclude Include="..\manual\ScriptingCore.h" />
36+
<ClInclude Include="..\manual\spidermonkey_specifics.h" />
4837
</ItemGroup>
4938
<PropertyGroup Label="Globals">
5039
<ProjectGuid>{39379840-825A-45A0-B363-C09FFEF864BD}</ProjectGuid>
@@ -73,11 +62,11 @@
7362
</ImportGroup>
7463
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7564
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
76-
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
65+
<Import Project="..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
7766
</ImportGroup>
7867
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7968
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
80-
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
69+
<Import Project="..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
8170
</ImportGroup>
8271
<PropertyGroup Label="UserMacros" />
8372
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -99,7 +88,7 @@
9988
<WarningLevel>Level3</WarningLevel>
10089
<Optimization>Disabled</Optimization>
10190
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\auto;$(ProjectDir)..\..\..\bindings\manual;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
91+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10392
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
10493
<MultiProcessorCompilation>true</MultiProcessorCompilation>
10594
<MinimalRebuild>false</MinimalRebuild>
@@ -109,8 +98,8 @@
10998
<GenerateDebugInformation>true</GenerateDebugInformation>
11099
</Link>
111100
<PreBuildEvent>
112-
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
113-
xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
101+
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
102+
xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
114103
</PreBuildEvent>
115104
</ItemDefinitionGroup>
116105
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -122,7 +111,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.
122111
<FunctionLevelLinking>true</FunctionLevelLinking>
123112
<IntrinsicFunctions>true</IntrinsicFunctions>
124113
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\auto;$(ProjectDir)..\..\..\bindings\manual;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126115
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
127116
<MultiProcessorCompilation>true</MultiProcessorCompilation>
128117
</ClCompile>
@@ -133,8 +122,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.
133122
<OptimizeReferences>true</OptimizeReferences>
134123
</Link>
135124
<PreBuildEvent>
136-
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
137-
xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
125+
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
126+
xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
138127
</PreBuildEvent>
139128
</ItemDefinitionGroup>
140129
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎jsb/bindings/proj.win32/libJSBinding.vcxproj.filters

Lines changed: 25 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,108 +5,76 @@
55
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
66
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
77
</Filter>
8-
<Filter Include="js">
9-
<UniqueIdentifier>{e19c6b81-737e-46ca-a683-a6d1db50a29c}</UniqueIdentifier>
10-
</Filter>
118
<Filter Include="auto">
129
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
1310
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
1411
</Filter>
1512
</ItemGroup>
1613
<ItemGroup>
17-
<ClCompile Include="..\cocos2d_specifics.cpp">
18-
<Filter>manual</Filter>
14+
<ClCompile Include="..\auto\jsb_cocos2dx_auto.cpp">
15+
<Filter>auto</Filter>
1916
</ClCompile>
20-
<ClCompile Include="..\js_bindings_core.cpp">
17+
<ClCompile Include="..\manual\js_manual_conversions.cpp">
2118
<Filter>manual</Filter>
2219
</ClCompile>
23-
<ClCompile Include="..\js_manual_conversions.cpp">
20+
<ClCompile Include="..\manual\jsb_opengl_functions.cpp">
2421
<Filter>manual</Filter>
2522
</ClCompile>
26-
<ClCompile Include="..\ScriptingCore.cpp">
23+
<ClCompile Include="..\manual\jsb_opengl_manual.cpp">
2724
<Filter>manual</Filter>
2825
</ClCompile>
29-
<ClCompile Include="..\js_bindings_opengl.cpp">
26+
<ClCompile Include="..\manual\jsb_opengl_registration.cpp">
3027
<Filter>manual</Filter>
3128
</ClCompile>
32-
<ClCompile Include="..\jsb_opengl_registration.cpp">
29+
<ClCompile Include="..\manual\ScriptingCore.cpp">
3330
<Filter>manual</Filter>
3431
</ClCompile>
35-
<ClCompile Include="..\jsb_opengl_manual.cpp">
32+
<ClCompile Include="..\manual\cocos2d_specifics.cpp">
3633
<Filter>manual</Filter>
3734
</ClCompile>
38-
<ClCompile Include="..\jsb_opengl_functions.cpp">
35+
<ClCompile Include="..\manual\js_bindings_core.cpp">
3936
<Filter>manual</Filter>
4037
</ClCompile>
41-
<ClCompile Include="..\..\..\bindings\auto\jsb_cocos2dx_auto.cpp">
42-
<Filter>auto</Filter>
38+
<ClCompile Include="..\manual\js_bindings_opengl.cpp">
39+
<Filter>manual</Filter>
4340
</ClCompile>
4441
</ItemGroup>
4542
<ItemGroup>
46-
<ClInclude Include="..\cocos2d_specifics.hpp">
47-
<Filter>manual</Filter>
43+
<ClInclude Include="..\auto\jsb_cocos2dx_auto.hpp">
44+
<Filter>auto</Filter>
4845
</ClInclude>
49-
<ClInclude Include="..\js_bindings_config.h">
46+
<ClInclude Include="..\manual\js_bindings_opengl.h">
5047
<Filter>manual</Filter>
5148
</ClInclude>
52-
<ClInclude Include="..\js_bindings_core.h">
49+
<ClInclude Include="..\manual\js_manual_conversions.h">
5350
<Filter>manual</Filter>
5451
</ClInclude>
55-
<ClInclude Include="..\js_manual_conversions.h">
52+
<ClInclude Include="..\manual\jsb_helper.h">
5653
<Filter>manual</Filter>
5754
</ClInclude>
58-
<ClInclude Include="..\ScriptingCore.h">
55+
<ClInclude Include="..\manual\jsb_opengl_functions.h">
5956
<Filter>manual</Filter>
6057
</ClInclude>
61-
<ClInclude Include="..\spidermonkey_specifics.h">
58+
<ClInclude Include="..\manual\jsb_opengl_manual.h">
6259
<Filter>manual</Filter>
6360
</ClInclude>
64-
<ClInclude Include="..\js_bindings_opengl.h">
61+
<ClInclude Include="..\manual\jsb_opengl_registration.h">
6562
<Filter>manual</Filter>
6663
</ClInclude>
67-
<ClInclude Include="..\jsb_opengl_functions.h">
64+
<ClInclude Include="..\manual\ScriptingCore.h">
6865
<Filter>manual</Filter>
6966
</ClInclude>
70-
<ClInclude Include="..\jsb_opengl_manual.h">
67+
<ClInclude Include="..\manual\spidermonkey_specifics.h">
7168
<Filter>manual</Filter>
7269
</ClInclude>
73-
<ClInclude Include="..\jsb_opengl_registration.h">
70+
<ClInclude Include="..\manual\cocos2d_specifics.hpp">
7471
<Filter>manual</Filter>
7572
</ClInclude>
76-
<ClInclude Include="..\jsb_helper.h">
73+
<ClInclude Include="..\manual\js_bindings_config.h">
7774
<Filter>manual</Filter>
7875
</ClInclude>
79-
<ClInclude Include="..\..\..\bindings\auto\jsb_cocos2dx_auto.hpp">
80-
<Filter>auto</Filter>
76+
<ClInclude Include="..\manual\js_bindings_core.h">
77+
<Filter>manual</Filter>
8178
</ClInclude>
8279
</ItemGroup>
83-
<ItemGroup>
84-
<None Include="..\..\..\bindings\auto\jsb_cocos2dx_auto_api.js">
85-
<Filter>auto</Filter>
86-
</None>
87-
<None Include="..\..\script\jsb.js">
88-
<Filter>js</Filter>
89-
</None>
90-
<None Include="..\..\script\jsb_chipmunk.js">
91-
<Filter>js</Filter>
92-
</None>
93-
<None Include="..\..\script\jsb_cocos2d.js">
94-
<Filter>js</Filter>
95-
</None>
96-
<None Include="..\..\script\jsb_cocos2d_extension.js">
97-
<Filter>js</Filter>
98-
</None>
99-
<None Include="..\..\script\jsb_opengl.js">
100-
<Filter>js</Filter>
101-
</None>
102-
<None Include="..\..\script\jsb_sys.js">
103-
<Filter>js</Filter>
104-
</None>
105-
<None Include="..\..\script\jsb_debugger.js">
106-
<Filter>js</Filter>
107-
</None>
108-
<None Include="..\..\script\jsb_cocosbuilder.js">
109-
<Filter>js</Filter>
110-
</None>
111-
</ItemGroup>
11280
</Project>

0 commit comments

Comments
 (0)