diff --git a/extensions/cocostudio/src/cocostudio/ActionTimeline/CSLoader.cpp b/extensions/cocostudio/src/cocostudio/ActionTimeline/CSLoader.cpp index a7424ba2f2ef..3cee45c8e9f1 100644 --- a/extensions/cocostudio/src/cocostudio/ActionTimeline/CSLoader.cpp +++ b/extensions/cocostudio/src/cocostudio/ActionTimeline/CSLoader.cpp @@ -229,7 +229,11 @@ CSLoader::CSLoader() CREATE_CLASS_NODE_READER_INFO(Node3DReader); CREATE_CLASS_NODE_READER_INFO(MeshReader); CREATE_CLASS_NODE_READER_INFO(UserCameraReader); + +#if defined(AX_ENABLE_EXT_PARTICLE3D) CREATE_CLASS_NODE_READER_INFO(Particle3DReader); +#endif // defined(AX_ENABLE_EXT_PARTICLE3D) + CREATE_CLASS_NODE_READER_INFO(GameNode3DReader); CREATE_CLASS_NODE_READER_INFO(Light3DReader); CREATE_CLASS_NODE_READER_INFO(TabControlReader); diff --git a/extensions/cocostudio/src/cocostudio/CocoStudio.cpp b/extensions/cocostudio/src/cocostudio/CocoStudio.cpp index 3605c97c1bcd..9b74d8ca07a4 100644 --- a/extensions/cocostudio/src/cocostudio/CocoStudio.cpp +++ b/extensions/cocostudio/src/cocostudio/CocoStudio.cpp @@ -26,7 +26,9 @@ #include "WidgetReader/Node3DReader/Node3DReader.h" #include "WidgetReader/MeshReader/MeshReader.h" #include "WidgetReader/UserCameraReader/UserCameraReader.h" +#if defined(AX_ENABLE_EXT_PARTICLE3D) #include "WidgetReader/Particle3DReader/Particle3DReader.h" +#endif // defined(AX_ENABLE_EXT_PARTICLE3D) namespace cocostudio { @@ -59,7 +61,9 @@ void destroyCocosStudio() Node3DReader::destroyInstance(); MeshReader::destroyInstance(); UserCameraReader::destroyInstance(); +#if defined(AX_ENABLE_EXT_PARTICLE3D) Particle3DReader::destroyInstance(); +#endif // defined(AX_ENABLE_EXT_PARTICLE3D) ax::CSLoader::destroyInstance(); diff --git a/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp b/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp index 02990796d033..8345d23e1381 100644 --- a/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp +++ b/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp @@ -24,6 +24,7 @@ #include "platform/FileUtils.h" #include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" +#if defined(AX_ENABLE_EXT_PARTICLE3D) #include "cocostudio/CSParseBinary_generated.h" #include "cocostudio/CSParse3DBinary_generated.h" @@ -147,3 +148,5 @@ Node* Particle3DReader::createNodeWithFlatBuffers(const flatbuffers::Table* part return ret; } } // namespace cocostudio + +#endif // defined(AX_ENABLE_EXT_PARTICLE3D) diff --git a/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h b/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h index 3f8b3e5a92a9..ebeab568d2b8 100644 --- a/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h +++ b/extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h @@ -25,6 +25,8 @@ #ifndef __cocos2d_libs__Particle3DReader__ #define __cocos2d_libs__Particle3DReader__ +#if defined(AX_ENABLE_EXT_PARTICLE3D) + #include "cocostudio/CocosStudioExport.h" #include "cocostudio/WidgetReader/NodeReaderProtocol.h" #include "cocostudio/WidgetReader/NodeReaderDefine.h" @@ -49,4 +51,6 @@ class CCS_DLL Particle3DReader : public ax::Object, public NodeReaderProtocol }; } // namespace cocostudio +#endif // defined(AX_ENABLE_EXT_PARTICLE3D) + #endif /* defined(__cocos2d_libs__Particle3DReader__) */ diff --git a/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.cpp b/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.cpp index e63bf1317d20..f6dfe1c32bec 100644 --- a/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.cpp +++ b/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.cpp @@ -1,3 +1,4 @@ +#if defined(AX_ENABLE_EXT_FAIRYGUI) #include "axlua_fairygui_manual.hpp" #include "lua-bindings/auto/axlua_fairygui_auto.hpp" #include "lua-bindings/manual/tolua_fix.h" @@ -1103,3 +1104,5 @@ int register_fairygui_module(lua_State* L) lua_pop(L, 1); return 1; } + +#endif // defined(AX_ENABLE_EXT_FAIRYGUI) diff --git a/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.hpp b/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.hpp index 967d8f39a291..96a7fad40c8b 100644 --- a/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.hpp +++ b/extensions/scripting/lua-bindings/manual/fairygui/axlua_fairygui_manual.hpp @@ -1,8 +1,11 @@ #ifndef SCRIPTING_AXLUA_FAIRYGUI_MANUAL_H__ #define SCRIPTING_AXLUA_FAIRYGUI_MANUAL_H__ +#if defined(AX_ENABLE_EXT_FAIRYGUI) #include "tolua++.h" TOLUA_API int register_fairygui_module(lua_State* L); +#endif // defined(AX_ENABLE_EXT_FAIRYGUI) + #endif diff --git a/extensions/scripting/lua-bindings/manual/lua_module_register.cpp b/extensions/scripting/lua-bindings/manual/lua_module_register.cpp index fd147cb3129c..85336491f4f2 100644 --- a/extensions/scripting/lua-bindings/manual/lua_module_register.cpp +++ b/extensions/scripting/lua-bindings/manual/lua_module_register.cpp @@ -63,7 +63,9 @@ int lua_module_register(lua_State* L) register_ui_module(L); register_extension_module(L); // TODO arnold +#if defined(AX_ENABLE_EXT_SPINE) register_spine_module(L); +#endif // defined(AX_ENABLE_EXT_SPINE) register_cocos3d_module(L); register_audioengine_module(L); #if defined(AX_ENABLE_3D_PHYSICS) && AX_ENABLE_BULLET_INTEGRATION @@ -72,7 +74,9 @@ int lua_module_register(lua_State* L) #if defined(AX_ENABLE_NAVMESH) register_navmesh_module(L); #endif +#if defined(AX_ENABLE_EXT_FAIRYGUI) register_fairygui_module(L); +#endif // defined(AX_ENABLE_EXT_FAIRYGUI) // register extensions: yaiso, lua-cjson lua_register_extensions(L); return 1; diff --git a/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.cpp b/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.cpp index d388e005cb38..0786edcc8d94 100644 --- a/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.cpp +++ b/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.cpp @@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#if defined(AX_ENABLE_EXT_SPINE) #include "lua-bindings/manual/spine/axlua_spine_manual.hpp" #include "lua-bindings/auto/axlua_spine_auto.hpp" @@ -615,3 +616,5 @@ int register_spine_module(lua_State* L) return 1; } + +#endif // defined(AX_ENABLE_EXT_SPINE) diff --git a/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.hpp b/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.hpp index de360325eb5a..9931b6f60c47 100644 --- a/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.hpp +++ b/extensions/scripting/lua-bindings/manual/spine/axlua_spine_manual.hpp @@ -24,6 +24,7 @@ ****************************************************************************/ #ifndef SCRIPTING_AXLUA_SPINE_MANUAL_H #define SCRIPTING_AXLUA_SPINE_MANUAL_H +#if defined(AX_ENABLE_EXT_SPINE) #ifdef __cplusplus extern "C" { @@ -53,4 +54,7 @@ TOLUA_API int register_spine_module(lua_State* L); // end group /// @} + +#endif // defined(AX_ENABLE_EXT_SPINE) + #endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_SPINE_MANUAL_H