Skip to content

Commit 55ef588

Browse files
author
James Chen
committed
Merge pull request #4 from dumganhar/master
test-javascript works on Win32.
2 parents f469d85 + 9a64959 commit 55ef588

18 files changed

+735
-622
lines changed

‎JSB/bindings/manual/chipmunk/libJSBindingForChipmunk.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
</ImportGroup>
5252
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5353
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54-
<Import Project="..\..\..\..\2d\cocos2d_headers.props" />
54+
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
5555
</ImportGroup>
5656
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5757
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58-
<Import Project="..\..\..\..\2d\cocos2d_headers.props" />
58+
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
5959
</ImportGroup>
6060
<PropertyGroup Label="UserMacros" />
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -77,7 +77,7 @@
7777
<WarningLevel>Level3</WarningLevel>
7878
<Optimization>Disabled</Optimization>
7979
<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>
80-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
80+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\manual;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8181
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
8282
<MultiProcessorCompilation>true</MultiProcessorCompilation>
8383
<MinimalRebuild>false</MinimalRebuild>
@@ -88,7 +88,7 @@
8888
</Link>
8989
<PreBuildEvent>
9090
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
91-
xcopy /Y /Q "$(ProjectDir)..\..\..\..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
91+
xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
9292
</PreBuildEvent>
9393
</ItemDefinitionGroup>
9494
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,7 +100,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\..\external\sqlite3\libraries\win32\*.*" "
100100
<FunctionLevelLinking>true</FunctionLevelLinking>
101101
<IntrinsicFunctions>true</IntrinsicFunctions>
102102
<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>
103-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
103+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\manual;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104104
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
105105
<MultiProcessorCompilation>true</MultiProcessorCompilation>
106106
</ClCompile>

‎JSB/bindings/manual/cocosbuilder/libJSBindingForBuilder.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_builder_auto.cpp" />
14+
<ClCompile Include="..\..\..\bindings\auto\jsb_cocos2dx_builder_auto.cpp" />
1515
<ClCompile Include="js_bindings_ccbreader.cpp" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_builder_auto.hpp" />
18+
<ClInclude Include="..\..\..\bindings\auto\jsb_cocos2dx_builder_auto.hpp" />
1919
<ClInclude Include="cocosbuilder_specifics.hpp" />
2020
<ClInclude Include="js_bindings_ccbreader.h" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<None Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_builder_auto_api.js" />
23+
<None Include="..\..\..\bindings\auto\jsb_cocos2dx_builder_auto_api.js" />
2424
</ItemGroup>
2525
<PropertyGroup Label="Globals">
2626
<ProjectGuid>{F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}</ProjectGuid>
@@ -49,11 +49,11 @@
4949
</ImportGroup>
5050
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5151
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52-
<Import Project="..\..\..\..\2d\cocos2d_headers.props" />
52+
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
5353
</ImportGroup>
5454
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5555
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56-
<Import Project="..\..\..\..\2d\cocos2d_headers.props" />
56+
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
5757
</ImportGroup>
5858
<PropertyGroup Label="UserMacros" />
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -75,7 +75,7 @@
7575
<WarningLevel>Level3</WarningLevel>
7676
<Optimization>Disabled</Optimization>
7777
<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>
78-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\manual;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7979
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
8080
<MultiProcessorCompilation>true</MultiProcessorCompilation>
8181
<MinimalRebuild>false</MinimalRebuild>
@@ -86,7 +86,7 @@
8686
</Link>
8787
<PreBuildEvent>
8888
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
89-
xcopy /Y /Q "$(ProjectDir)..\..\..\..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
89+
xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
9090
</PreBuildEvent>
9191
</ItemDefinitionGroup>
9292
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -98,7 +98,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\..\external\sqlite3\libraries\win32\*.*" "
9898
<FunctionLevelLinking>true</FunctionLevelLinking>
9999
<IntrinsicFunctions>true</IntrinsicFunctions>
100100
<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>
101-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\manual;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102102
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
103103
<MultiProcessorCompilation>true</MultiProcessorCompilation>
104104
</ClCompile>

‎JSB/bindings/manual/cocosbuilder/libJSBindingForBuilder.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
</Filter>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_builder_auto.cpp">
14+
<ClCompile Include="..\..\..\bindings\auto\jsb_cocos2dx_builder_auto.cpp">
1515
<Filter>generated</Filter>
1616
</ClCompile>
1717
<ClCompile Include="js_bindings_ccbreader.cpp">
1818
<Filter>manual</Filter>
1919
</ClCompile>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_builder_auto.hpp">
22+
<ClInclude Include="..\..\..\bindings\auto\jsb_cocos2dx_builder_auto.hpp">
2323
<Filter>generated</Filter>
2424
</ClInclude>
2525
<ClInclude Include="cocosbuilder_specifics.hpp">
@@ -30,7 +30,7 @@
3030
</ClInclude>
3131
</ItemGroup>
3232
<ItemGroup>
33-
<None Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_builder_auto_api.js">
33+
<None Include="..\..\..\bindings\auto\jsb_cocos2dx_builder_auto_api.js">
3434
<Filter>generated</Filter>
3535
</None>
3636
</ItemGroup>

‎JSB/bindings/manual/cocostudio/libJSBindingForStudio.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_studio_auto.cpp" />
14+
<ClCompile Include="..\..\..\bindings\auto\jsb_cocos2dx_studio_auto.cpp" />
1515
<ClCompile Include="jsb_cocos2dx_studio_manual.cpp" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_studio_auto.hpp" />
18+
<ClInclude Include="..\..\..\bindings\auto\jsb_cocos2dx_studio_auto.hpp" />
1919
<ClInclude Include="jsb_cocos2dx_studio_manual.h" />
2020
</ItemGroup>
2121
<ItemGroup>
22-
<None Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_studio_auto_api.js" />
22+
<None Include="..\..\..\bindings\auto\jsb_cocos2dx_studio_auto_api.js" />
2323
</ItemGroup>
2424
<PropertyGroup Label="Globals">
2525
<ProjectGuid>{79D34511-E54E-410A-8BBA-EF175AD6C695}</ProjectGuid>
@@ -48,11 +48,11 @@
4848
</ImportGroup>
4949
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5050
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51-
<Import Project="..\..\..\..\2d\cocos2d_headers.props" />
51+
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
5252
</ImportGroup>
5353
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5454
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55-
<Import Project="..\..\..\..\2d\cocos2d_headers.props" />
55+
<Import Project="..\..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
5656
</ImportGroup>
5757
<PropertyGroup Label="UserMacros" />
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -74,7 +74,7 @@
7474
<WarningLevel>Level3</WarningLevel>
7575
<Optimization>Disabled</Optimization>
7676
<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>
77-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)external;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\manual;$(EngineRoot)external;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7878
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
7979
<MultiProcessorCompilation>true</MultiProcessorCompilation>
8080
<MinimalRebuild>false</MinimalRebuild>
@@ -85,7 +85,7 @@
8585
</Link>
8686
<PreBuildEvent>
8787
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
88-
xcopy /Y /Q "$(ProjectDir)..\..\..\..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
88+
xcopy /Y /Q "$(ProjectDir)..\..\..\cocos2d-x\external\sqlite3\libraries\win32\*.*" "$(OutDir)"</Command>
8989
</PreBuildEvent>
9090
</ItemDefinitionGroup>
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -97,7 +97,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\..\external\sqlite3\libraries\win32\*.*" "
9797
<FunctionLevelLinking>true</FunctionLevelLinking>
9898
<IntrinsicFunctions>true</IntrinsicFunctions>
9999
<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>
100-
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)external;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
100+
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(ProjectDir)..\..\..\bindings\manual;$(EngineRoot)external;$(ProjectDir)..\..\..\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101101
<DisableSpecificWarnings>4068;4101;4800;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
102102
<MultiProcessorCompilation>true</MultiProcessorCompilation>
103103
</ClCompile>

‎JSB/bindings/manual/cocostudio/libJSBindingForStudio.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
</Filter>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_studio_auto.cpp">
14+
<ClCompile Include="..\..\..\bindings\auto\jsb_cocos2dx_studio_auto.cpp">
1515
<Filter>generated</Filter>
1616
</ClCompile>
1717
<ClCompile Include="jsb_cocos2dx_studio_manual.cpp">
1818
<Filter>manual</Filter>
1919
</ClCompile>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_studio_auto.hpp">
22+
<ClInclude Include="..\..\..\bindings\auto\jsb_cocos2dx_studio_auto.hpp">
2323
<Filter>generated</Filter>
2424
</ClInclude>
2525
<ClInclude Include="jsb_cocos2dx_studio_manual.h">
2626
<Filter>manual</Filter>
2727
</ClInclude>
2828
</ItemGroup>
2929
<ItemGroup>
30-
<None Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_studio_auto_api.js">
30+
<None Include="..\..\..\bindings\auto\jsb_cocos2dx_studio_auto_api.js">
3131
<Filter>generated</Filter>
3232
</None>
3333
</ItemGroup>

0 commit comments

Comments
 (0)