Skip to content
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.

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

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

Merged
merged 9 commits into from
Nov 13, 2018
Merged

Conversation

drelaptop
Copy link
Contributor

@drelaptop drelaptop commented Nov 12, 2018

improve #19153

with _defaultResRootPath changed, you will have to adapt js/lua resources copy too, or you will get file not found error. so I don't think it's elegent to do this work "Copy resources to "Resources/" on win32".

please give your options @crazyhappygame

@crazyhappygame
Copy link
Contributor

You are right js/lua *.vcxproj should be updated. Thank you!
Could you fix it in this PR? If no I can do this in 1-2 days.

I think that we should keep the same folder structure for linux and win32.

I have a plan to replace function cocos_copy_res with following implementation:

set (source "${CMAKE_SOURCE_DIR}/resources")
set (destination "${CMAKE_CURRENT_BINARY_DIR}/resources")
add_custom_command(
 TARGET ${PROJECT_NAME} POST_BUILD
 COMMAND ${CMAKE_COMMAND} -E create_symlink ${source} ${destination} 
 DEPENDS ${destination}
 COMMENT "symbolic link resources folder from ${source} => ${destination}"
)

@drelaptop
Copy link
Contributor Author

drelaptop commented Nov 13, 2018

yeah, I can fix it in this PR.

we plan to release a 3.17.1 test version to our test team in this week.

@drelaptop drelaptop added this to the 3.17.1 milestone Nov 13, 2018
@drelaptop drelaptop closed this Nov 13, 2018
@drelaptop drelaptop reopened this Nov 13, 2018
@drelaptop drelaptop merged commit ae61f8f into cocos2d:v3 Nov 13, 2018
@crazyhappygame
Copy link
Contributor

@drelaptop thank you!

stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Dec 3, 2018
* commit '387e1a77b5822475e5c499fa1e7539144b7aac30':
  update cocos cmd, disable "gen-libs" (cocos2d#19167)
  go on, Copy resources to "Resources/" on win32 (cocos2d#19166)
  [TiledMap] locate image path relative to tsx file (cocos2d#19147)

# Conflicts:
#	cocos/editor-support/spine/proj.win32/libSpine.vcxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
#	cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
#	templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln
#	templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
#	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
#	tests/js-tests/project/proj.win32/js-tests.vcxproj
#	tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj
#	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
#	tools/cocos2d-console
@drelaptop drelaptop deleted the v3-root branch December 16, 2018 07:41
@drelaptop drelaptop restored the v3-root branch December 16, 2018 07:41
huangwei1024 pushed a commit to huangwei1024/cocos2d-x that referenced this pull request Jun 20, 2019
* re-target on wi10 for win32 project

* fix js-tests sources copy

* fix lua tests

* fix js template

* remove libbox2d.vcxproj ref

* improve js source copy

* copy source in post build event

* little improve

* update external
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants