Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/Android.mk

202 lines
8.2 KiB
Makefile
Raw Normal View History

Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cocos_extension_static
LOCAL_MODULE_FILENAME := libextension
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
LOCAL_SRC_FILES := \
assets-manager/AssetsManager.cpp \
no message
2014-10-09 18:30:39 +08:00
assets-manager/Manifest.cpp \
assets-manager/AssetsManagerEx.cpp \
assets-manager/CCEventAssetsManagerEx.cpp \
assets-manager/CCEventListenerAssetsManagerEx.cpp \
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
GUI/CCControlExtension/CCControl.cpp \
GUI/CCControlExtension/CCControlButton.cpp \
GUI/CCControlExtension/CCControlColourPicker.cpp \
GUI/CCControlExtension/CCControlHuePicker.cpp \
GUI/CCControlExtension/CCControlPotentiometer.cpp \
GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
GUI/CCControlExtension/CCControlSlider.cpp \
GUI/CCControlExtension/CCControlStepper.cpp \
GUI/CCControlExtension/CCControlSwitch.cpp \
GUI/CCControlExtension/CCControlUtils.cpp \
GUI/CCControlExtension/CCInvocation.cpp \
GUI/CCScrollView/CCScrollView.cpp \
GUI/CCScrollView/CCTableView.cpp \
GUI/CCScrollView/CCTableViewCell.cpp \
physics-nodes/CCPhysicsDebugNode.cpp \
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
physics-nodes/CCPhysicsSprite.cpp \
rename folder and fix warning
2015-02-12 17:54:27 +08:00
Particle3D/CCParticle3DAffector.cpp \
Particle3D/CCParticle3DEmitter.cpp \
Particle3D/CCParticle3DRender.cpp \
Particle3D/CCParticleSystem3D.cpp \
modify project using short path
2015-03-05 13:40:52 +08:00
Particle3D/PU/CCPUDynamicAttribute.cpp \
Particle3D/PU/CCPUDynamicAttributeTranslator.cpp \
Particle3D/PU/CCPUForceField.cpp \
Particle3D/PU/CCPUMaterialManager.cpp \
Particle3D/PU/CCPUMaterialTranslator.cpp \
Particle3D/PU/CCPUNoise.cpp \
Particle3D/PU/CCPUPlane.cpp \
Particle3D/PU/CCPURendererTranslator.cpp \
Particle3D/PU/CCPUScriptCompiler.cpp \
Particle3D/PU/CCPUScriptLexer.cpp \
Particle3D/PU/CCPUScriptParser.cpp \
Particle3D/PU/CCPUScriptTranslator.cpp \
Particle3D/PU/CCPUSimpleSpline.cpp \
Particle3D/PU/CCPUSphere.cpp \
Particle3D/PU/CCPUTechniqueTranslator.cpp \
Particle3D/PU/CCPUTranslateManager.cpp \
Particle3D/PU/CCPUUtil.cpp \
modify pu path
2015-03-05 13:28:42 +08:00
Particle3D/PU/CCPUParticleSystem3D.cpp \
Particle3D/PU/CCPUParticleSystem3DTranslator.cpp \
modify project using short path
2015-03-05 13:40:52 +08:00
Particle3D/PU/CCPUListener.cpp \
Particle3D/PU/CCPUAffector.cpp \
Particle3D/PU/CCPUAffectorManager.cpp \
Particle3D/PU/CCPUAffectorTranslator.cpp \
Particle3D/PU/CCPUAlignAffector.cpp \
Particle3D/PU/CCPUAlignAffectorTranslator.cpp \
Particle3D/PU/CCPUBaseCollider.cpp \
Particle3D/PU/CCPUBaseColliderTranslator.cpp \
Particle3D/PU/CCPUBaseForceAffector.cpp \
Particle3D/PU/CCPUBaseForceAffectorTranslator.cpp \
Particle3D/PU/CCPUBoxCollider.cpp \
Particle3D/PU/CCPUBoxColliderTranslator.cpp \
Particle3D/PU/CCPUCollisionAvoidanceAffector.cpp \
Particle3D/PU/CCPUCollisionAvoidanceAffectorTranslator.cpp \
Particle3D/PU/CCPUColorAffector.cpp \
Particle3D/PU/CCPUColorAffectorTranslator.cpp \
Particle3D/PU/CCPUFlockCenteringAffector.cpp \
Particle3D/PU/CCPUFlockCenteringAffectorTranslator.cpp \
Particle3D/PU/CCPUForceFieldAffector.cpp \
Particle3D/PU/CCPUForceFieldAffectorTranslator.cpp \
Particle3D/PU/CCPUGeometryRotator.cpp \
Particle3D/PU/CCPUGeometryRotatorTranslator.cpp \
Particle3D/PU/CCPUGravityAffector.cpp \
Particle3D/PU/CCPUGravityAffectorTranslator.cpp \
Particle3D/PU/CCPUInterParticleCollider.cpp \
Particle3D/PU/CCPUInterParticleColliderTranslator.cpp \
Particle3D/PU/CCPUJetAffector.cpp \
Particle3D/PU/CCPUJetAffectorTranslator.cpp \
Particle3D/PU/CCPULineAffector.cpp \
Particle3D/PU/CCPULineAffectorTranslator.cpp \
Particle3D/PU/CCPULinearForceAffector.cpp \
Particle3D/PU/CCPULinearForceAffectorTranslator.cpp \
Particle3D/PU/CCPUParticleFollower.cpp \
Particle3D/PU/CCPUParticleFollowerTranslator.cpp \
Particle3D/PU/CCPUPathFollower.cpp \
Particle3D/PU/CCPUPathFollowerTranslator.cpp \
Particle3D/PU/CCPUPlaneCollider.cpp \
Particle3D/PU/CCPUPlaneColliderTranslator.cpp \
Particle3D/PU/CCPURandomiser.cpp \
Particle3D/PU/CCPURandomiserTranslator.cpp \
Particle3D/PU/CCPUScaleAffector.cpp \
Particle3D/PU/CCPUScaleAffectorTranslator.cpp \
Particle3D/PU/CCPUScaleVelocityAffector.cpp \
Particle3D/PU/CCPUScaleVelocityAffectorTranslator.cpp \
Particle3D/PU/CCPUSineForceAffector.cpp \
Particle3D/PU/CCPUSineForceAffectorTranslator.cpp \
Particle3D/PU/CCPUSphereCollider.cpp \
Particle3D/PU/CCPUSphereColliderTranslator.cpp \
Particle3D/PU/CCPUTextureAnimator.cpp \
Particle3D/PU/CCPUTextureAnimatorTranslator.cpp \
Particle3D/PU/CCPUTextureRotator.cpp \
Particle3D/PU/CCPUTextureRotatorTranslator.cpp \
Particle3D/PU/CCPUVelocityMatchingAffector.cpp \
Particle3D/PU/CCPUVelocityMatchingAffectorTranslator.cpp \
Particle3D/PU/CCPUVortexAffector.cpp \
Particle3D/PU/CCPUVortexAffectorTranslator.cpp \
Particle3D/PU/CCPUEmitter.cpp \
Particle3D/PU/CCPUEmitterTranslator.cpp \
Particle3D/PU/CCPUEmitterManager.cpp \
Particle3D/PU/CCPUBoxEmitter.cpp \
Particle3D/PU/CCPUBoxEmitterTranslator.cpp \
Particle3D/PU/CCPUCircleEmitter.cpp \
Particle3D/PU/CCPUCircleEmitterTranslator.cpp \
Particle3D/PU/CCPULineEmitter.cpp \
Particle3D/PU/CCPULineEmitterTranslator.cpp \
Particle3D/PU/CCPUMeshSurfaceEmitter.cpp \
Particle3D/PU/CCPUMeshSurfaceEmitterTranslator.cpp \
Particle3D/PU/CCPUPointEmitter.cpp \
Particle3D/PU/CCPUPointEmitterTranslator.cpp \
Particle3D/PU/CCPUPositionEmitter.cpp \
Particle3D/PU/CCPUPositionEmitterTranslator.cpp \
Particle3D/PU/CCPUSlaveEmitter.cpp \
Particle3D/PU/CCPUSlaveEmitterTranslator.cpp \
Particle3D/PU/CCPUSphereSurfaceEmitter.cpp \
Particle3D/PU/CCPUSphereSurfaceEmitterTranslator.cpp \
Particle3D/PU/CCPUVertexEmitter.cpp \
Particle3D/PU/CCPURender.cpp \
Particle3D/PU/CCPUBeamRender.cpp \
Particle3D/PU/CCPUBillboardChain.cpp \
Particle3D/PU/CCPURibbonTrail.cpp \
Particle3D/PU/CCPURibbonTrailRender.cpp \
Particle3D/PU/CCPUDoAffectorEventHandler.cpp \
Particle3D/PU/CCPUDoAffectorEventHandlerTranslator.cpp \
Particle3D/PU/CCPUDoEnableComponentEventHandler.cpp \
Particle3D/PU/CCPUDoEnableComponentEventHandlerTranslator.cpp \
Particle3D/PU/CCPUDoExpireEventHandler.cpp \
Particle3D/PU/CCPUDoExpireEventHandlerTranslator.cpp \
Particle3D/PU/CCPUDoFreezeEventHandler.cpp \
Particle3D/PU/CCPUDoFreezeEventHandlerTranslator.cpp \
Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp \
Particle3D/PU/CCPUDoPlacementParticleEventHandlerTranslator.cpp \
Particle3D/PU/CCPUDoScaleEventHandler.cpp \
Particle3D/PU/CCPUDoScaleEventHandlerTranslator.cpp \
Particle3D/PU/CCPUDoStopSystemEventHandler.cpp \
Particle3D/PU/CCPUDoStopSystemEventHandlerTranslator.cpp \
Particle3D/PU/CCPUEventHandler.cpp \
Particle3D/PU/CCPUEventHandlerManager.cpp \
Particle3D/PU/CCPUEventHandlerTranslator.cpp \
Particle3D/PU/CCPUObserver.cpp \
Particle3D/PU/CCPUObserverManager.cpp \
Particle3D/PU/CCPUObserverTranslator.cpp \
Particle3D/PU/CCPUOnClearObserver.cpp \
Particle3D/PU/CCPUOnClearObserverTranslator.cpp \
Particle3D/PU/CCPUOnCollisionObserver.cpp \
Particle3D/PU/CCPUOnCollisionObserverTranslator.cpp \
Particle3D/PU/CCPUOnCountObserver.cpp \
Particle3D/PU/CCPUOnCountObserverTranslator.cpp \
Particle3D/PU/CCPUOnEmissionObserver.cpp \
Particle3D/PU/CCPUOnEmissionObserverTranslator.cpp \
Particle3D/PU/CCPUOnEventFlagObserver.cpp \
Particle3D/PU/CCPUOnEventFlagObserverTranslator.cpp \
Particle3D/PU/CCPUOnExpireObserver.cpp \
Particle3D/PU/CCPUOnExpireObserverTranslator.cpp \
Particle3D/PU/CCPUOnPositionObserver.cpp \
Particle3D/PU/CCPUOnPositionObserverTranslator.cpp \
Particle3D/PU/CCPUOnQuotaObserver.cpp \
Particle3D/PU/CCPUOnQuotaObserverTranslator.cpp \
Particle3D/PU/CCPUOnRandomObserver.cpp \
Particle3D/PU/CCPUOnRandomObserverTranslator.cpp \
Particle3D/PU/CCPUOnTimeObserver.cpp \
Particle3D/PU/CCPUOnTimeObserverTranslator.cpp \
Particle3D/PU/CCPUOnVelocityObserver.cpp \
Particle3D/PU/CCPUOnVelocityObserverTranslator.cpp \
Particle3D/PU/CCPUBehaviour.cpp \
Particle3D/PU/CCPUBehaviourManager.cpp \
Particle3D/PU/CCPUBehaviourTranslator.cpp \
Particle3D/PU/CCPUSlaveBehaviour.cpp \
add physics3d support
2015-05-08 15:49:33 +08:00
Particle3D/PU/CCPUSlaveBehaviourTranslator.cpp
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
LOCAL_STATIC_LIBRARIES += cocos_curl_static
LOCAL_STATIC_LIBRARIES += box2d_static
add physics3d support
2015-05-08 15:49:33 +08:00
LOCAL_STATIC_LIBRARIES += bullet_static
Squashed commit of the following: commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92 Merge: 61788a0 082caaf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 13 00:13:38 2015 -0700 Merge branch 'v3' into downloader_decouple commit 61788a0b34188fed5367cab121817db97198bcd8 Merge: 8c1e211 5e21580 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:45:12 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f Merge: 2ea66af 8d73883 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:42:04 2015 -0700 Merge pull request #6 from minggo/downloader_decouple fix js binding error commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98 Author: minggo <ming@cocos2d-x.org> Date: Thu Aug 13 11:09:58 2015 +0800 fix js binding error commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40 Merge: 8cdb0b6 bc964e8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 09:14:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806 Merge: 9272765 08eeca9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 20:11:46 2015 -0700 Merge pull request #5 from minggo/downloader_decouple fix lua-binding error commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15 Author: minggo <ming@cocos2d-x.org> Date: Wed Aug 12 10:34:05 2015 +0800 fix lua-binding error commit 927276589d57432477f8ffc033e19a21a215b246 Merge: 8252464 6f4ed8a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 10:39:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b Merge: 5dddbb6 138df42 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 06:53:48 2015 -0700 Merge pull request #4 from minggo/downloader_decouple fix linking error in lua-tests on Android commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145 Author: minggo <ming@cocos2d-x.org> Date: Tue Aug 11 16:23:53 2015 +0800 fix link error in lua-tests commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 23:22:50 2015 -0700 works for real on win32 commit ddadaf82231b60c8e343718561c0d78657afe7c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 22:26:59 2015 -0700 compiles on win32 commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:57:49 2015 -0700 compiles on iOS!! commit f706f97962eb393bf7dfec79739ff8dfdec103d5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:27:03 2015 -0700 compiles and runs Ok on windows. Tested all downloadertests + assetmanagertest commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 20:24:28 2015 -0700 updates windows projects commit e77fd8a278594fefc24ff13cbee038508429294d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 19:56:10 2015 -0700 compiles on Android commit 5f515e3519a0688d11476ea6ef235007e8378c96 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:34:33 2015 -0700 trying to fix a compile issue on iOS WIP commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:25:11 2015 -0700 make bug fixes adds public `getHeader` commit a228799ba74eb8642c43d215a802f811a576a4aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 17:42:19 2015 -0700 some linux fixes commit 2cab23d87acc138823ebe9dcec9d42f827690d99 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:58:53 2015 -0700 Squashed commit of the following: commit 86227e9138c1fb523bd28186d355de65cc64c588 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:55:17 2015 -0700 works %100 and uses less memory than before commit a9cafa6f2fe7847e279934d2c162287680760dda Merge: 0bbc62e 0cbd71f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:49:33 2015 -0700 Merge branch 'v3' into cocos_net commit 0bbc62ee1fbfd107a935131d5d93994e87865afa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:46:55 2015 -0700 more tests... and works but there is huge bug. ProgData <vector> needs the position of DownloadUnits <unordered_map> but <unordered_map> does not guaranty the order. So in my next commit I"ll merge DownloadUnit with ProgressData commit 389ed8639a1942f628773616a8e340bc66a0c1d7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 13:47:07 2015 -0700 debugging info commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:47:31 2015 -0700 sync and async tests working ok commit 999fa7a7bfb28565492f47b39caef7f1a079c183 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:38:38 2015 -0700 adding tests commit 91ee294942510718400edc0d00d3c744d00339ee Merge: 76ab703 7f215e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 10:03:50 2015 -0700 Merge branch 'v3' into cocos_net commit 76ab7032d3a21156f05395a021391a16649f755a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 00:22:20 2015 -0700 Downloader tests commit b65c4dad7089660bfe697c0dab3e9290d1a6d013 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 21:34:54 2015 -0700 compiles on Xcode 7 commit ec0d66340b8daf0b042d36333dff759cd424f465 Merge: 878e4b5 0d77838 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 11:02:24 2015 -0700 Merge branch 'v3' into cocos_net commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 18:07:02 2015 -0700 working, yeah! commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 17:49:59 2015 -0700 code is more thread-safe friendly commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 16:39:02 2015 -0700 fixes callbacks commit ddab4d753106c6ff11304c1c69739c5611e3f20a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 15:43:51 2015 -0700 cleaner code runs callbacks in cocos2d thread only if needed commit ef75844aaa010633e6e27ae6e69460174460d5c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:58:04 2015 -0700 removed weak_ptr<> from ProgressData that logic of the code is added in the callbacks commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:54:07 2015 -0700 checks whether or not the callbacks are in the cocos2d thread commit ae6594a6f866f6b5015ba293db23343887063d2f Merge: 4c61069 6831e24 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 10:48:34 2015 -0700 Merge branch 'v3' into cocos_net commit 4c61069a7e0e33fa0332df700cc8df4807178caf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 21:36:50 2015 -0700 almost there... Downloader has std::vector<FILE*> instead of FileDescriptors code cleaner... commit c34d04a8218d2be5c316e0487e5ac46792bbed76 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 20:38:44 2015 -0700 passes progressData to batch no need to alloc memory for each ProgressData commit f7e8bbd8b85f214b919bce6118d4158dd6d26368 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 17:47:23 2015 -0700 tidier code and more optimizations commit a486dc78aedcf9c6178e490292edd572f8a7b374 Merge: 4178327 a06421b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 14:03:22 2015 -0700 Merge branch 'v3' into cocos_net commit 417832705910a6ebd16a876cd98064ea16f0f45c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 18:13:13 2015 -0700 not finished yet... ...but trying to have a common inteface with batched and non-batched downloads commit 1d0e4652763c2e1511ac102a62defae6c6a89220 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 16:29:39 2015 -0700 ErrorCallback compiles starting the batching code commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18 Merge: c180425 8d836da Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 10:28:51 2015 -0700 Merge branch 'v3' into cocos_net commit c180425d8181b8e6f53be766d8d2b94f908ae168 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 15:35:53 2015 -0700 More progress on migrating multiple-file downloader to the implementation file commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 14:00:02 2015 -0700 Dowloader moved to `cocos2d::network` commit 14b1d0825106701b5435a266b255f09291b6486b Merge: 13cfc8d f744383 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:13:55 2015 -0700 Merge branch 'v3' into cocos_net commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:11:45 2015 -0700 DownloadUnits belong to network commit e6e17564ead1fb7f6f7df343b0627a104cd756f8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 12:23:36 2015 -0700 adds `check for option` commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 10:37:51 2015 -0700 Downloader: using URLDownload in one case. 3 more to go. Not tested yet commit 9b26e9cfac425635027189ccab835054b68bc83d Merge: 20fe063 253d9c4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 08:35:53 2015 -0700 Merge branch 'v3' into cocos_net commit 20fe0636e36ae7f1da048545b3345f526d5b64de Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 17:36:07 2015 -0700 URLDownload: initial commit HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d guidelines Adds `CCIRULDownload` interface. Adds `CCURLDownload` implementation based on libcurl. Not working yet. `Downloader` uses `URLDownload` for some of its functions. WIP commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0 Merge: e408fe0 642ccac Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 14:00:43 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into cocos_net commit e408fe0b9303813d20bab2f7bf548f3b7af416a6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 13:59:46 2015 -0700 Adds more files to Xcode project ...even if they are not being compiled. Much easier to add missing functionality to the rest of the platforms commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 11:36:57 2015 -0700 removes unneeded headers
2015-08-13 15:14:10 +08:00
LOCAL_STATIC_LIBRARIES += cocos_network_static
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
LOCAL_CXXFLAGS += -fexceptions
Improve Android.mk
2014-10-17 10:13:33 +08:00
LOCAL_C_INCLUDES := $(LOCAL_PATH)
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
Improve Android.mk
2014-10-17 10:13:33 +08:00
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/. \
$(LOCAL_PATH)/.. \
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
$(LOCAL_PATH)/GUI/CCControlExtension \
$(LOCAL_PATH)/GUI/CCScrollView
include $(BUILD_STATIC_LIBRARY)