From cb4acc6311dd2e941054cd711dc6f7a3f3e1326a Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 12 Mar 2014 11:03:23 +0800 Subject: [PATCH] fix linux compile error --- templates/cocos2dx_files.json.REMOVED.git-id | 2 +- tests/lua-empty-test/project/CMakeLists.txt | 2 +- tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj | 4 ++-- tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/cocos2dx_files.json.REMOVED.git-id b/templates/cocos2dx_files.json.REMOVED.git-id index 78f903166b..15d6dd3dcc 100644 --- a/templates/cocos2dx_files.json.REMOVED.git-id +++ b/templates/cocos2dx_files.json.REMOVED.git-id @@ -1 +1 @@ -2556bc226669ba393f6fb1900d941f17baeacb02 \ No newline at end of file +ac17b42db61c1dee0e31ae7df7bcb2fa33e899d1 \ No newline at end of file diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index aaeb5b1e55..9c4544ac0c 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(${APP_NAME} target_link_libraries(${APP_NAME} luabinding - gui + ui network cocostudio cocosbuilder diff --git a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj index 6ed5cb8431..1967dfe52d 100644 --- a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj @@ -181,7 +181,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -203,4 +203,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ - \ No newline at end of file + diff --git a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj index 0cdffe39e5..66d853f657 100644 --- a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj @@ -202,7 +202,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -221,4 +221,4 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - \ No newline at end of file +