diff --git a/tools/tolua/ax_3d.ini b/tools/tolua/ax_3d.ini index 9a2b0b1ba3..bb66cdf619 100644 --- a/tools/tolua/ax_3d.ini +++ b/tools/tolua/ax_3d.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID cxxgenerator_headers = @@ -23,7 +23,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/cocos2d.h %(axysdir)s/core/3d/CCBundle3D.h +headers = %(axdir)s/core/cocos2d.h %(axdir)s/core/3d/CCBundle3D.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_audioengine.ini b/tools/tolua/ax_audioengine.ini index 6c96da12e3..061eb68c4b 100644 --- a/tools/tolua/ax_audioengine.ini +++ b/tools/tolua/ax_audioengine.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -26,7 +26,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/audio/AudioEngine.h +headers = %(axdir)s/core/audio/AudioEngine.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_backend.ini b/tools/tolua/ax_backend.ini index 135f952916..468111acc9 100644 --- a/tools/tolua/ax_backend.ini +++ b/tools/tolua/ax_backend.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/extensions -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/extensions -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID cxxgenerator_headers = @@ -23,8 +23,8 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/renderer/backend/Types.h %(axysdir)s/core/renderer/backend/ProgramState.h %(axysdir)s/core/renderer/backend/Texture.h %(axysdir)s/core/renderer/backend/VertexLayout.h %(axysdir)s/core/renderer/backend/Device.h %(axysdir)s/core/renderer/backend/RenderTarget.h -#headers = %(axysdir)s/core/renderer/backend/ProgramState.h +headers = %(axdir)s/core/renderer/backend/Types.h %(axdir)s/core/renderer/backend/ProgramState.h %(axdir)s/core/renderer/backend/Texture.h %(axdir)s/core/renderer/backend/VertexLayout.h %(axdir)s/core/renderer/backend/Device.h %(axdir)s/core/renderer/backend/RenderTarget.h +#headers = %(axdir)s/core/renderer/backend/ProgramState.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_base.ini b/tools/tolua/ax_base.ini index 2d0b0c83b8..7d91bcc8a0 100644 --- a/tools/tolua/ax_base.ini +++ b/tools/tolua/ax_base.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/extensions -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/robin-map/include -I%(axysdir)s/thirdparty/jni.hpp/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/extensions -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/jni.hpp/include ax_flags = -DANDROID cxxgenerator_headers = @@ -23,7 +23,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/cocos2d.h %(axysdir)s/core/2d/CCProtectedNode.h %(axysdir)s/core/base/CCAsyncTaskPool.h %(axysdir)s/extensions/scripting/lua-bindings/manual/CCComponentLua.h %(axysdir)s/core/renderer/CCRenderer.h %(axysdir)s/core/renderer/CCPipelineDescriptor.h %(axysdir)s/core/renderer/backend/RenderTarget.h +headers = %(axdir)s/core/cocos2d.h %(axdir)s/core/2d/CCProtectedNode.h %(axdir)s/core/base/CCAsyncTaskPool.h %(axdir)s/extensions/scripting/lua-bindings/manual/CCComponentLua.h %(axdir)s/core/renderer/CCRenderer.h %(axdir)s/core/renderer/CCPipelineDescriptor.h %(axdir)s/core/renderer/backend/RenderTarget.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_controller.ini b/tools/tolua/ax_controller.ini index 07bf3af9ca..59e505e835 100644 --- a/tools/tolua/ax_controller.ini +++ b/tools/tolua/ax_controller.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/base -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/base -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID cxxgenerator_headers = @@ -25,7 +25,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/base/CCGameController.h +headers = %(axdir)s/core/base/CCGameController.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_csloader.ini b/tools/tolua/ax_csloader.ini index 66ad023cf8..983af27f67 100644 --- a/tools/tolua/ax_csloader.ini +++ b/tools/tolua/ax_csloader.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/extensions/cocostudio -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -24,7 +24,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/extensions/cocostudio/ActionTimeline/CSLoader.h +headers = %(axdir)s/extensions/cocostudio/ActionTimeline/CSLoader.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_extension.ini b/tools/tolua/ax_extension.ini index efb4778ec8..1cac5aa0e8 100644 --- a/tools/tolua/ax_extension.ini +++ b/tools/tolua/ax_extension.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s -I%(axysdir)s/extensions -I%(axysdir)s/extensions/cocostudio -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/rapidjson -I%(axysdir)s/thirdparty/box2d/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s -I%(axdir)s/extensions -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/rapidjson -I%(axdir)s/thirdparty/box2d/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -24,7 +24,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/extensions/cocos-ext.h +headers = %(axdir)s/extensions/cocos-ext.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_navmesh.ini b/tools/tolua/ax_navmesh.ini index 83a11c9f9f..1b1c1f9122 100644 --- a/tools/tolua/ax_navmesh.ini +++ b/tools/tolua/ax_navmesh.ini @@ -18,7 +18,7 @@ clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -DAX__USE_NAVM win32_clang_flags = -U __SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include -I%(axysdir)s/thirdparty/recast/Detour -I%(axysdir)s/thirdparty/recast/DetourCrowd -I%(axysdir)s/thirdparty/recast/DetourTileCache -I%(axysdir)s/thirdparty/recast/DebugUtils -I%(axysdir)s/thirdparty/recast/fastlz -I%(axysdir)s/thirdparty/recast/Recast -I%(axysdir)s/thirdparty/lua/luajit/include -I%(axysdir)s/thirdparty/lua/tolua -I%(axysdir)s/extensions -I%(axysdir)s/extensions/scripting/lua-bindings/manual +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/recast/Detour -I%(axdir)s/thirdparty/recast/DetourCrowd -I%(axdir)s/thirdparty/recast/DetourTileCache -I%(axdir)s/thirdparty/recast/DebugUtils -I%(axdir)s/thirdparty/recast/fastlz -I%(axdir)s/thirdparty/recast/Recast -I%(axdir)s/thirdparty/lua/luajit/include -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions -I%(axdir)s/extensions/scripting/lua-bindings/manual ax_flags = -DANDROID @@ -28,7 +28,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/navmesh/CCNavMesh.h %(axysdir)s/extensions/scripting/lua-bindings/manual/navmesh/axlua_navmesh_conversions.h +headers = %(axdir)s/core/navmesh/CCNavMesh.h %(axdir)s/extensions/scripting/lua-bindings/manual/navmesh/axlua_navmesh_conversions.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_physics.ini b/tools/tolua/ax_physics.ini index a85f2cc3d1..ef3fb3d2a3 100644 --- a/tools/tolua/ax_physics.ini +++ b/tools/tolua/ax_physics.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -26,7 +26,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/cocos2d.h +headers = %(axdir)s/core/cocos2d.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_physics3d.ini b/tools/tolua/ax_physics3d.ini index a00a81d147..9ffa667417 100644 --- a/tools/tolua/ax_physics3d.ini +++ b/tools/tolua/ax_physics3d.ini @@ -18,7 +18,7 @@ clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -DAX__ENABLE_B win32_clang_flags = -U __SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include -I%(axysdir)s/thirdparty/bullet +ax_headers = -I%(axdir)s/core -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/bullet ax_flags = -DANDROID @@ -28,7 +28,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/physics3d/CCPhysics3D.h +headers = %(axdir)s/core/physics3d/CCPhysics3D.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_spine.ini b/tools/tolua/ax_spine.ini index 7269f7fd79..949f365c65 100644 --- a/tools/tolua/ax_spine.ini +++ b/tools/tolua/ax_spine.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/extensions -I%(axysdir)s/extensions/spine -I%(axysdir)s/extensions/spine/runtime/include -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/spine -I%(axdir)s/extensions/spine/runtime/include -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -24,7 +24,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/extensions/spine/spine-cocos2dx.h +headers = %(axdir)s/extensions/spine/spine-cocos2dx.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_studio.ini b/tools/tolua/ax_studio.ini index 6c5a677279..2cae13fb81 100644 --- a/tools/tolua/ax_studio.ini +++ b/tools/tolua/ax_studio.ini @@ -17,7 +17,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/thirdparty -I%(axysdir)s/core -I%(axysdir)s/extensions -I%(axysdir)s/extensions/cocostudio -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty/robin-map/include -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/lua/luajit/include -I%(axysdir)s/thirdparty/lua/tolua -I%(axysdir)s/extensions/scripting/lua-bindings/manual +ax_headers = -I%(axdir)s/thirdparty -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/extensions/cocostudio -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty/robin-map/include -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/lua/luajit/include -I%(axdir)s/thirdparty/lua/tolua -I%(axdir)s/extensions/scripting/lua-bindings/manual ax_flags = -DANDROID @@ -27,7 +27,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/extensions/cocostudio/CocoStudio.h %(axysdir)s/extensions/cocostudio/CCComExtensionData.h %(axysdir)s/extensions/scripting/lua-bindings/manual/cocostudio/lua-cocostudio-conversions.h +headers = %(axdir)s/extensions/cocostudio/CocoStudio.h %(axdir)s/extensions/cocostudio/CCComExtensionData.h %(axdir)s/extensions/scripting/lua-bindings/manual/cocostudio/lua-cocostudio-conversions.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_ui.ini b/tools/tolua/ax_ui.ini index 0be8dadf62..400091cbb4 100644 --- a/tools/tolua/ax_ui.ini +++ b/tools/tolua/ax_ui.ini @@ -17,7 +17,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/extensions -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -27,7 +27,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/ui/CocosGUI.h +headers = %(axdir)s/core/ui/CocosGUI.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_video.ini b/tools/tolua/ax_video.ini index 57bc12021d..5697dc77dc 100644 --- a/tools/tolua/ax_video.ini +++ b/tools/tolua/ax_video.ini @@ -14,7 +14,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/extensions -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -24,7 +24,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/ui/UIVideoPlayer/UIVideoPlayer.h +headers = %(axdir)s/core/ui/UIVideoPlayer/UIVideoPlayer.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/ax_webview.ini b/tools/tolua/ax_webview.ini index 9fbaf7c68d..0ebed3681e 100644 --- a/tools/tolua/ax_webview.ini +++ b/tools/tolua/ax_webview.ini @@ -13,7 +13,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -ax_headers = -I%(axysdir)s/core -I%(axysdir)s/extensions -I%(axysdir)s/core/platform/android -I%(axysdir)s/thirdparty -I%(axysdir)s/thirdparty/jni.hpp/include -I%(axysdir)s/thirdparty/robin-map/include +ax_headers = -I%(axdir)s/core -I%(axdir)s/extensions -I%(axdir)s/core/platform/android -I%(axdir)s/thirdparty -I%(axdir)s/thirdparty/jni.hpp/include -I%(axdir)s/thirdparty/robin-map/include ax_flags = -DANDROID @@ -23,7 +23,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(ax_headers)s %(android_flags)s %(clang_flags)s %(ax_flags)s %(extra_flags)s # what headers to parse -headers = %(axysdir)s/core/ui/UIWebView/UIWebView.h +headers = %(axdir)s/core/ui/UIWebView/UIWebView.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/genbindings.py b/tools/tolua/genbindings.py index 54eb4bad4e..a2fd63c96f 100755 --- a/tools/tolua/genbindings.py +++ b/tools/tolua/genbindings.py @@ -203,7 +203,7 @@ def main(): config.set('DEFAULT', 'androidndkdir', g_ndk_root) config.set('DEFAULT', 'clangllvmdir', llvm_path) config.set('DEFAULT', 'gcc_toolchain_dir', gcc_toolchain_path) - config.set('DEFAULT', 'axysdir', ax_root) + config.set('DEFAULT', 'axdir', ax_root) config.set('DEFAULT', 'cxxgeneratordir', cxx_generator_root) config.set('DEFAULT', 'extra_flags', extraFlags)