From 73125f46d260e761687eb34da7bc7e3c05815188 Mon Sep 17 00:00:00 2001 From: jianglong0156 Date: Thu, 30 Jul 2015 14:38:20 +0800 Subject: [PATCH] add file in project file with android, linux wp8.1 (reverted from commit 948628b800e7177c2697fd615a37427b755fd76c) --- cocos/scripting/js-bindings/CMakeLists.txt | 1 - .../js-bindings/proj.android/Android.mk | 1 - .../libjscocos2d.Shared.vcxitems | 2 -- .../libjscocos2d.Shared.vcxitems.filters | 18 ++++++------------ 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/cocos/scripting/js-bindings/CMakeLists.txt b/cocos/scripting/js-bindings/CMakeLists.txt index eaaa91db0c..b610e671c2 100644 --- a/cocos/scripting/js-bindings/CMakeLists.txt +++ b/cocos/scripting/js-bindings/CMakeLists.txt @@ -69,7 +69,6 @@ set(JSBINDING_SRC manual/spine/jsb_cocos2dx_spine_manual.cpp manual/ui/jsb_cocos2dx_ui_manual.cpp manual/3d/jsb_cocos2dx_3d_manual.cpp - manual/3d/jsb_cocos2dx_3d_conversions.cpp manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp manual/navmesh/jsb_cocos2dx_navmesh_conversions.cpp manual/navmesh/jsb_cocos2dx_navmesh_manual.cpp diff --git a/cocos/scripting/js-bindings/proj.android/Android.mk b/cocos/scripting/js-bindings/proj.android/Android.mk index 9c3858c459..1e2ca85211 100644 --- a/cocos/scripting/js-bindings/proj.android/Android.mk +++ b/cocos/scripting/js-bindings/proj.android/Android.mk @@ -57,7 +57,6 @@ LOCAL_SRC_FILES := ../auto/jsb_cocos2dx_3d_auto.cpp \ ../manual/jsb_opengl_registration.cpp \ ../manual/jsb_event_dispatcher_manual.cpp \ ../manual/3d/jsb_cocos2dx_3d_manual.cpp \ - ../manual/3d/jsb_cocos2dx_3d_conversions.cpp \ ../manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp \ ../manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp \ ../manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp \ diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems index 2781b0031c..9f61b81d2e 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems @@ -24,7 +24,6 @@ - @@ -73,7 +72,6 @@ - diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems.filters b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems.filters index 4f759ee169..89fcb884a1 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems.filters +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems.filters @@ -59,6 +59,9 @@ manual + + manual + manual\chipmunk @@ -134,12 +137,6 @@ auto - - manual\3d - - - manual\3d - @@ -190,6 +187,9 @@ manual + + manual + manual\chipmunk @@ -253,12 +253,6 @@ auto - - manual\3d - - - manual\3d -