From 573fdafbd8a80a7fc50f138950f5faf5d03e4050 Mon Sep 17 00:00:00 2001 From: yangxiao Date: Wed, 4 Mar 2015 14:25:46 +0800 Subject: [PATCH 1/2] android work --- tests/cpp-tests/proj.android/jni/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cpp-tests/proj.android/jni/Android.mk b/tests/cpp-tests/proj.android/jni/Android.mk index 1beecb957a..bc30532323 100644 --- a/tests/cpp-tests/proj.android/jni/Android.mk +++ b/tests/cpp-tests/proj.android/jni/Android.mk @@ -7,7 +7,6 @@ LOCAL_MODULE := cpp_tests_shared LOCAL_MODULE_FILENAME := libcpp_tests LOCAL_SRC_FILES := main.cpp \ -../../Classes/CocosStudio3DTest/CocosStudio3DTest.cpp \ ../../Classes/AppDelegate.cpp \ ../../Classes/BaseTest.cpp \ ../../Classes/controller.cpp \ From 9665bb6dd8a0149faf3d907e233bc7884eaf1712 Mon Sep 17 00:00:00 2001 From: yangxiao Date: Wed, 4 Mar 2015 15:17:37 +0800 Subject: [PATCH 2/2] add to linux project --- extensions/CMakeLists.txt | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 4d25bff873..542d543329 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -129,5 +129,56 @@ set(COCOS_EXTENSIONS_SRC ../extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.cpp ../extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.cpp ../extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.cpp + ../extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.cpp ${PLATFORM_EXTENSIONS_SRC} )