Skip to content

go on, Copy resources to "Resources/" on win32 #19166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 13, 2018
Merged

go on, Copy resources to "Resources/" on win32 #19166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e1dc33
re-target on wi10 for win32 project
drelaptop Nov 12, 2018
a5c3aaf
fix js-tests sources copy
drelaptop Nov 12, 2018
f534403
fix lua tests
drelaptop Nov 12, 2018
9f81c2e
fix js template
drelaptop Nov 12, 2018
fad6b14
remove libbox2d.vcxproj ref
drelaptop Nov 12, 2018
c5b4606
improve js source copy
drelaptop Nov 13, 2018
52e0cc6
copy source in post build event
drelaptop Nov 13, 2018
3f5c9da
little improve
drelaptop Nov 13, 2018
8efa85c
update external
drelaptop Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cocos/2d/libcocos2d.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<ProjectGuid>{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}</ProjectGuid>
<RootNamespace>cocos2d-x.win32</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
3 changes: 0 additions & 3 deletions cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,9 +1505,6 @@
<None Include="..\cocos2d.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\external\Box2D\proj-win10\libbox2d.vcxproj">
<Project>{0c32d479-46d5-46c3-9aa9-0a8ff8320516}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\external\recast\proj.win10\librecast.vcxproj">
<Project>{f551524d-8a70-4b2f-a7c2-28ae61150022}</Project>
</ProjectReference>
Expand Down
1 change: 1 addition & 0 deletions cocos/editor-support/spine/proj.win32/libSpine.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}</ProjectGuid>
<RootNamespace>libSpine</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
1 change: 1 addition & 0 deletions cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<ProjectGuid>{39379840-825A-45A0-B363-C09FFEF864BD}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libjscocos2d</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
1 change: 1 addition & 0 deletions cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
<ProjectGuid>{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}</ProjectGuid>
<RootNamespace>libluacocos2d</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion external/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "v3-deps-146",
"version": "v3-deps-148",
"zip_file_size": "146254799",
"repo_name": "cocos2d-x-3rd-party-libs-bin",
"repo_parent": "https://github.com/cocos2d/",
Expand Down
3 changes: 0 additions & 3 deletions templates/cpp-template-default/proj.win32/HelloCpp.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)\Resources\" /D /E /I /F /Y
<ProjectReference Include="..\cocos2d\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
<Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
</ProjectReference>
<ProjectReference Include="..\cocos2d\external\Box2D\proj.win32\libbox2d.vcxproj">
<Project>{929480e7-23c0-4df6-8456-096d71547116}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="game.rc" />
Expand Down
2 changes: 0 additions & 2 deletions templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\cocos2d-x\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}"
Expand Down
10 changes: 5 additions & 5 deletions templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<CustomBuildStep>
<Command>xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\script" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y
copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y
copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y</Command>
<Command>xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\Resources\script\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resources\src\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resources\res\" /D /E /I /F /Y
copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\Resources\" /Y
copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\Resources\" /Y</Command>
<Outputs>$(TargetName).cab</Outputs>
<Inputs>$(TargetFileName)</Inputs>
</CustomBuildStep>
Expand Down
2 changes: 0 additions & 2 deletions templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsimulator", "..\..\cocos2d-x\tools\simulator\libsimulator\proj.win32\libsimulator.vcxproj", "{001B324A-BB91-4E83-875C-C92F75C40857}"
Expand Down
4 changes: 2 additions & 2 deletions templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
<CustomBuildStep>
<Command>if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)"
xcopy /Y /Q "$(OutDir)*.dll" "$(LocalDebuggerWorkingDirectory)"
xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E /I /F /Y</Command>
xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\Resources\src\" /D /E /I /F /Y</Command>
<Outputs>$(TargetName).cab</Outputs>
<Inputs>$(TargetFileName)</Inputs>
</CustomBuildStep>
Expand Down
3 changes: 0 additions & 3 deletions tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,6 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat
<ProjectReference Include="..\..\..\cocos\editor-support\spine\proj.win10\libSpine.vcxproj">
<Project>{4b3ba10a-941f-4e08-8a50-8a7fcb822bb8}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\external\Box2D\proj-win10\libbox2d.vcxproj">
<Project>{0c32d479-46d5-46c3-9aa9-0a8ff8320516}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" />
Expand Down
1 change: 1 addition & 0 deletions tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ProjectGuid>{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}</ProjectGuid>
<RootNamespace>cpp-empty-test-win32</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 2 additions & 0 deletions tests/cpp-tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ if(APPLE)
set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}")
endif()
elseif(WINDOWS)
# "too large PDB" error often occurs in cpp-tests when using default "/Zi"
target_compile_options(${APP_NAME} PRIVATE /Z7)
cocos_copy_target_dll(${APP_NAME} COPY_TO ${APP_RES_DIR}/..)
endif()

Expand Down
3 changes: 0 additions & 3 deletions tests/cpp-tests/proj.win10/cpp-tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,6 @@
<ProjectReference Include="..\..\..\cocos\editor-support\spine\proj.win10\libSpine.vcxproj">
<Project>{4b3ba10a-941f-4e08-8a50-8a7fcb822bb8}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\external\Box2D\proj-win10\libbox2d.vcxproj">
<Project>{0c32d479-46d5-46c3-9aa9-0a8ff8320516}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" />
Expand Down
1 change: 1 addition & 0 deletions tests/cpp-tests/proj.win32/cpp-tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ProjectGuid>{76A39BB2-9B84-4C65-98A5-654D86B86F2A}</ProjectGuid>
<RootNamespace>test_win32</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
1 change: 1 addition & 0 deletions tests/game-controller-test/proj.win32/game-controller-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ProjectGuid>{1FA2BD06-2F52-48F6-8468-C0CC33127F5E}</ProjectGuid>
<RootNamespace>test_win32</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
62 changes: 28 additions & 34 deletions tests/js-tests/project/proj.win32/js-tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{D0F06A44-A245-4D13-A498-0120C203B539}</ProjectGuid>
<RootNamespace>js-tests</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down Expand Up @@ -102,35 +103,30 @@
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
</PreLinkEvent>
<Link>
<AdditionalDependencies>mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PreBuildEvent>
<PostBuildEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"

mkdir "$(OutDir)\script"
mkdir "$(OutDir)\src"
mkdir "$(OutDir)\res"
mkdir "$(OutDir)\Resources\script"
mkdir "$(OutDir)\Resources\src"
mkdir "$(OutDir)\Resources\res"
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\script" /e /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y</Command>
</PreBuildEvent>
<PreBuildEvent>
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\Resources\script\" /e /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)\Resources\src\" /e /Y
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\Resources\res\" /e /Y
copy "$(ProjectDir)..\..\main.js" "$(OutDir)\Resources\"
copy "$(ProjectDir)..\..\project.json" "$(OutDir)\Resources\"
xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\resjs\" /e /Y</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy js and resource files.</Message>
</PreBuildEvent>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
Expand Down Expand Up @@ -164,33 +160,31 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y</Command>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
</PreLinkEvent>
<Link>
<AdditionalDependencies>mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
<PostBuildEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"

mkdir "$(OutDir)\script"
mkdir "$(OutDir)\src"
mkdir "$(OutDir)\res"
mkdir "$(OutDir)\Resources\script"
mkdir "$(OutDir)\Resources\src"
mkdir "$(OutDir)\Resources\res"
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\script" /e /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y</Command>
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\Resources\script" /e /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)\Resources\src\" /e /Y
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\Resources\res\" /e /Y
copy "$(ProjectDir)..\..\main.js" "$(OutDir)\Resources\"
copy "$(ProjectDir)..\..\project.json" "$(OutDir)\Resources\"
xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\" /e /Y</Command>
<Message>Copy js and resource files.</Message>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy js and resource files.</Message>
</PreBuildEvent>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Classes\js_DrawNode3D_bindings.cpp" />
Expand Down
21 changes: 11 additions & 10 deletions tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{13E55395-94A2-4CD9-BFC2-1A051F80C17D}</ProjectGuid>
<RootNamespace>lua-empty-test.win32</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down Expand Up @@ -110,12 +111,12 @@
<TargetMachine>MachineX86</TargetMachine>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y
<PostBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
</PreBuildEvent>
</PostBuildEvent>
<PreLinkEvent>
<Command>
</Command>
Expand Down Expand Up @@ -165,12 +166,12 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y
<PostBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos" /D /E /I /F /Y
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
</PreBuildEvent>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Classes\AppDelegate.cpp" />
Expand Down
29 changes: 15 additions & 14 deletions tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}</ProjectGuid>
<ProjectName>lua-tests</ProjectName>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -110,15 +111,15 @@
<DllDataFileName>
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)script" /D /E /I /F /Y
<PostBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)Resources\script\" /D /E /I /F /Y
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
<Message>copy files</Message>
</PreBuildEvent>
</PostBuildEvent>
<PreLinkEvent>
<Command>
</Command>
Expand Down Expand Up @@ -163,21 +164,21 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
<DllDataFileName>
</DllDataFileName>
</Midl>
<PreBuildEvent>
<PostBuildEvent>
<Command>
</Command>
<Message>copy files</Message>
</PreBuildEvent>
</PostBuildEvent>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<CustomBuildStep>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)script" /D /E /I /F /Y
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)Resources\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)Resources\script\" /D /E /I /F /Y
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
</CustomBuildStep>
<CustomBuildStep>
Expand Down
1 change: 1 addition & 0 deletions tests/performance-tests/proj.win32/performance-tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ProjectGuid>{2778C02D-DDD0-4A92-A6AA-C3E2B7EDE3FF}</ProjectGuid>
<RootNamespace>test_win32</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down