al: Merge include/src (#87)

2024-10-06 18:13:23 +00:00 · 2024-06-13 21:10:45 +02:00 · 2024-06-13 21:10:45 +02:00 · e32c4b6e3b
commit e32c4b6e3b
parent 0b16ad111f
331 changed files with 11 additions and 4 deletions
--- a/.github/scripts/copy-headers.sh
+++ b/.github/scripts/copy-headers.sh
@ -16,7 +16,7 @@ mkdir $DESTINATION_PATH/NintendoSDK $DESTINATION_PATH/agl $DESTINATION_PATH/al $
 cp -r ./lib/NintendoSDK/include/* $DESTINATION_PATH/NintendoSDK
 cp -r ./lib/aarch64 $DESTINATION_PATH/
 cp -r ./lib/agl/include/* $DESTINATION_PATH/agl
-cp -r ./lib/al/include/* $DESTINATION_PATH/al
+rsync -a --prune-empty-dirs --include '*/' --include '*.h' --exclude '*' lib/al/ $DESTINATION_PATH/al
 cp -r ./lib/eui/include/* $DESTINATION_PATH/eui
 cp -r ./lib/sead/include/* $DESTINATION_PATH/sead

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -34,7 +34,7 @@ foreach (SOURCE ${SOURCES_COMBINED})
 endforeach()

 target_include_directories(odyssey PRIVATE src)
-target_include_directories(odyssey PRIVATE lib/al/include)
+target_include_directories(odyssey PRIVATE lib/al)
 target_compile_definitions(odyssey PRIVATE NON_MATCHING)
 target_compile_options(odyssey PRIVATE -fno-rtti -fno-exceptions)
 target_compile_options(odyssey PRIVATE -Wall -Wextra -Wdeprecated)
--- a/lib/al/src/Library/Action/ActorActionKeeper.cpp
+++ b/lib/al/src/Library/Action/ActorActionKeeper.cpp
--- a/lib/al/include/Library/Action/ActorActionKeeper.h
+++ b/lib/al/include/Library/Action/ActorActionKeeper.h
--- a/lib/al/include/Library/Anim/AnimPlayerSkl.h
+++ b/lib/al/include/Library/Anim/AnimPlayerSkl.h
--- a/lib/al/include/Library/Anim/SklAnimRetargettingInfo.h
+++ b/lib/al/include/Library/Anim/SklAnimRetargettingInfo.h
--- a/lib/al/src/Library/Application/ApplicationMessageReceiver.cpp
+++ b/lib/al/src/Library/Application/ApplicationMessageReceiver.cpp
--- a/lib/al/include/Library/Application/ApplicationMessageReceiver.h
+++ b/lib/al/include/Library/Application/ApplicationMessageReceiver.h
--- a/lib/al/include/Library/Area/AreaInitInfo.h
+++ b/lib/al/include/Library/Area/AreaInitInfo.h
--- a/lib/al/include/Library/Area/AreaObjDirector.h
+++ b/lib/al/include/Library/Area/AreaObjDirector.h
--- a/lib/al/include/Library/Area/AreaObjUtil.h
+++ b/lib/al/include/Library/Area/AreaObjUtil.h
--- a/lib/al/src/Library/Area/AreaShape.cpp
+++ b/lib/al/src/Library/Area/AreaShape.cpp
--- a/lib/al/include/Library/Area/AreaShape.h
+++ b/lib/al/include/Library/Area/AreaShape.h
--- a/lib/al/src/Library/Area/AreaShapeCube.cpp
+++ b/lib/al/src/Library/Area/AreaShapeCube.cpp
--- a/lib/al/include/Library/Area/AreaShapeCube.h
+++ b/lib/al/include/Library/Area/AreaShapeCube.h
--- a/lib/al/src/Library/Area/AreaShapeCylinder.cpp
+++ b/lib/al/src/Library/Area/AreaShapeCylinder.cpp
--- a/lib/al/include/Library/Area/AreaShapeCylinder.h
+++ b/lib/al/include/Library/Area/AreaShapeCylinder.h
--- a/lib/al/src/Library/Area/AreaShapeInfinite.cpp
+++ b/lib/al/src/Library/Area/AreaShapeInfinite.cpp
--- a/lib/al/include/Library/Area/AreaShapeInfinite.h
+++ b/lib/al/include/Library/Area/AreaShapeInfinite.h
--- a/lib/al/src/Library/Area/AreaShapeOval.cpp
+++ b/lib/al/src/Library/Area/AreaShapeOval.cpp
--- a/lib/al/include/Library/Area/AreaShapeOval.h
+++ b/lib/al/include/Library/Area/AreaShapeOval.h
--- a/lib/al/src/Library/Area/AreaShapeSphere.cpp
+++ b/lib/al/src/Library/Area/AreaShapeSphere.cpp
--- a/lib/al/include/Library/Area/AreaShapeSphere.h
+++ b/lib/al/include/Library/Area/AreaShapeSphere.h
--- a/lib/al/include/Library/Area/IUseAreaObj.h
+++ b/lib/al/include/Library/Area/IUseAreaObj.h
--- a/lib/al/include/Library/Area/SwitchAreaDirector.h
+++ b/lib/al/include/Library/Area/SwitchAreaDirector.h
--- a/lib/al/include/Library/Audio/AudioDirector.h
+++ b/lib/al/include/Library/Audio/AudioDirector.h
--- a/lib/al/include/Library/Audio/AudioKeeper.h
+++ b/lib/al/include/Library/Audio/AudioKeeper.h
--- a/lib/al/include/Library/Audio/IAudioSystemPause.h
+++ b/lib/al/include/Library/Audio/IAudioSystemPause.h
--- a/lib/al/include/Library/Audio/IUseAudioKeeper.h
+++ b/lib/al/include/Library/Audio/IUseAudioKeeper.h
--- a/lib/al/include/Library/Audio/System/AudioSystemInfo.h
+++ b/lib/al/include/Library/Audio/System/AudioSystemInfo.h
--- a/lib/al/src/Library/Base/HashCodeUtil.cpp
+++ b/lib/al/src/Library/Base/HashCodeUtil.cpp
--- a/lib/al/include/Library/Base/HashCodeUtil.h
+++ b/lib/al/include/Library/Base/HashCodeUtil.h
--- a/lib/al/src/Library/Base/StringUtil.cpp
+++ b/lib/al/src/Library/Base/StringUtil.cpp
--- a/lib/al/include/Library/Base/StringUtil.h
+++ b/lib/al/include/Library/Base/StringUtil.h
--- a/lib/al/include/Library/Bgm/BgmDirector.h
+++ b/lib/al/include/Library/Bgm/BgmDirector.h
--- a/lib/al/include/Library/Bgm/BgmFunction.h
+++ b/lib/al/include/Library/Bgm/BgmFunction.h
--- a/lib/al/src/Library/Bgm/BgmKeeper.cpp
+++ b/lib/al/src/Library/Bgm/BgmKeeper.cpp
--- a/lib/al/include/Library/Bgm/BgmKeeper.h
+++ b/lib/al/include/Library/Bgm/BgmKeeper.h
--- a/lib/al/include/Library/Bgm/BgmLineFunction.h
+++ b/lib/al/include/Library/Bgm/BgmLineFunction.h
--- a/lib/al/include/Library/Camera/CameraDirector.h
+++ b/lib/al/include/Library/Camera/CameraDirector.h
--- a/lib/al/src/Library/Camera/CameraPoser.cpp
+++ b/lib/al/src/Library/Camera/CameraPoser.cpp
--- a/lib/al/include/Library/Camera/CameraPoser.h
+++ b/lib/al/include/Library/Camera/CameraPoser.h
--- a/lib/al/include/Library/Camera/CameraPoserFunction.h
+++ b/lib/al/include/Library/Camera/CameraPoserFunction.h
--- a/lib/al/include/Library/Camera/CameraUtil.h
+++ b/lib/al/include/Library/Camera/CameraUtil.h
--- a/lib/al/include/Library/Camera/IUseCamera.h
+++ b/lib/al/include/Library/Camera/IUseCamera.h
--- a/lib/al/src/Library/Camera/SnapShotCameraCtrl.cpp
+++ b/lib/al/src/Library/Camera/SnapShotCameraCtrl.cpp
--- a/lib/al/include/Library/Camera/SnapShotCameraCtrl.h
+++ b/lib/al/include/Library/Camera/SnapShotCameraCtrl.h
--- a/lib/al/src/Library/Clipping/ViewIdHolder.cpp
+++ b/lib/al/src/Library/Clipping/ViewIdHolder.cpp
--- a/lib/al/include/Library/Clipping/ViewIdHolder.h
+++ b/lib/al/include/Library/Clipping/ViewIdHolder.h
--- a/lib/al/include/Library/Collision/Collider.h
+++ b/lib/al/include/Library/Collision/Collider.h
--- a/lib/al/include/Library/Collision/CollisionDirector.h
+++ b/lib/al/include/Library/Collision/CollisionDirector.h
--- a/lib/al/include/Library/Collision/IUseCollision.h
+++ b/lib/al/include/Library/Collision/IUseCollision.h
--- a/lib/al/src/Library/Collision/KCollisionServer.cpp
+++ b/lib/al/src/Library/Collision/KCollisionServer.cpp
--- a/lib/al/include/Library/Collision/KCollisionServer.h
+++ b/lib/al/include/Library/Collision/KCollisionServer.h
--- a/lib/al/include/Library/Controller/GamePadSystem.h
+++ b/lib/al/include/Library/Controller/GamePadSystem.h
--- a/lib/al/src/Library/Controller/InputFunction.cpp
+++ b/lib/al/src/Library/Controller/InputFunction.cpp
--- a/lib/al/include/Library/Controller/InputFunction.h
+++ b/lib/al/include/Library/Controller/InputFunction.h
--- a/lib/al/include/Library/Controller/JoyPadAccelPoseAnalyzer.h
+++ b/lib/al/include/Library/Controller/JoyPadAccelPoseAnalyzer.h
--- a/lib/al/include/Library/Controller/PadRumbleDirector.h
+++ b/lib/al/include/Library/Controller/PadRumbleDirector.h
--- a/lib/al/src/Library/Debug/Host.cpp
+++ b/lib/al/src/Library/Debug/Host.cpp
--- a/lib/al/include/Library/Debug/Host.h
+++ b/lib/al/include/Library/Debug/Host.h
--- a/lib/al/include/Library/Demo/DemoFunction.h
+++ b/lib/al/include/Library/Demo/DemoFunction.h
--- a/lib/al/include/Library/Draw/GraphicsFunction.h
+++ b/lib/al/include/Library/Draw/GraphicsFunction.h
--- a/lib/al/include/Library/Draw/GraphicsSystemInfo.h
+++ b/lib/al/include/Library/Draw/GraphicsSystemInfo.h
--- a/lib/al/include/Library/Effect/EffectKeeper.h
+++ b/lib/al/include/Library/Effect/EffectKeeper.h
--- a/lib/al/include/Library/Effect/EffectSystem.h
+++ b/lib/al/include/Library/Effect/EffectSystem.h
--- a/lib/al/include/Library/Effect/EffectSystemInfo.h
+++ b/lib/al/include/Library/Effect/EffectSystemInfo.h
--- a/lib/al/include/Library/Effect/IUseEffectKeeper.h
+++ b/lib/al/include/Library/Effect/IUseEffectKeeper.h
--- a/lib/al/src/Library/Event/SceneEventFlowMsg.cpp
+++ b/lib/al/src/Library/Event/SceneEventFlowMsg.cpp
--- a/lib/al/include/Library/Event/SceneEventFlowMsg.h
+++ b/lib/al/include/Library/Event/SceneEventFlowMsg.h
--- a/lib/al/src/Library/Execute/ActorExecuteInfo.cpp
+++ b/lib/al/src/Library/Execute/ActorExecuteInfo.cpp
--- a/lib/al/include/Library/Execute/ActorExecuteInfo.h
+++ b/lib/al/include/Library/Execute/ActorExecuteInfo.h
--- a/lib/al/src/Library/Execute/ExecuteDirector.cpp
+++ b/lib/al/src/Library/Execute/ExecuteDirector.cpp
--- a/lib/al/include/Library/Execute/ExecuteDirector.h
+++ b/lib/al/include/Library/Execute/ExecuteDirector.h
--- a/lib/al/include/Library/Execute/ExecuteOrder.h
+++ b/lib/al/include/Library/Execute/ExecuteOrder.h
--- a/lib/al/include/Library/Execute/ExecuteRequestKeeper.h
+++ b/lib/al/include/Library/Execute/ExecuteRequestKeeper.h
--- a/lib/al/include/Library/Execute/ExecuteSystemInitInfo.h
+++ b/lib/al/include/Library/Execute/ExecuteSystemInitInfo.h
--- a/lib/al/include/Library/Execute/ExecuteTable.h
+++ b/lib/al/include/Library/Execute/ExecuteTable.h
--- a/lib/al/include/Library/Execute/ExecuteTableHolderDraw.h
+++ b/lib/al/include/Library/Execute/ExecuteTableHolderDraw.h
--- a/lib/al/include/Library/Execute/ExecuteTableHolderUpdate.h
+++ b/lib/al/include/Library/Execute/ExecuteTableHolderUpdate.h
--- a/lib/al/include/Library/Execute/ExecuteTablesImpl.h
+++ b/lib/al/include/Library/Execute/ExecuteTablesImpl.h
--- a/lib/al/include/Library/Execute/ExecutorListBase.h
+++ b/lib/al/include/Library/Execute/ExecutorListBase.h
--- a/lib/al/src/Library/Execute/IUseExecutor.cpp
+++ b/lib/al/src/Library/Execute/IUseExecutor.cpp
--- a/lib/al/include/Library/Execute/IUseExecutor.h
+++ b/lib/al/include/Library/Execute/IUseExecutor.h
--- a/lib/al/src/Library/Execute/LayoutExecuteInfo.cpp
+++ b/lib/al/src/Library/Execute/LayoutExecuteInfo.cpp
--- a/lib/al/include/Library/Execute/LayoutExecuteInfo.h
+++ b/lib/al/include/Library/Execute/LayoutExecuteInfo.h
--- a/lib/al/include/Library/Factory/Factory.h
+++ b/lib/al/include/Library/Factory/Factory.h
--- a/lib/al/include/Library/File/FileUtil.h
+++ b/lib/al/include/Library/File/FileUtil.h
--- a/lib/al/include/Library/HitSensor/HitSensorKeeper.h
+++ b/lib/al/include/Library/HitSensor/HitSensorKeeper.h
--- a/lib/al/include/Library/HitSensor/SensorFunction.h
+++ b/lib/al/include/Library/HitSensor/SensorFunction.h
--- a/lib/al/include/Library/HostIO/HioNode.h
+++ b/lib/al/include/Library/HostIO/HioNode.h
--- a/lib/al/include/Library/HostIO/IUseName.h
+++ b/lib/al/include/Library/HostIO/IUseName.h
--- a/lib/al/include/Library/Joint/JointControllerKeeper.h
+++ b/lib/al/include/Library/Joint/JointControllerKeeper.h
--- a/lib/al/include/Library/Layout/IUseLayout.h
+++ b/lib/al/include/Library/Layout/IUseLayout.h
--- a/lib/al/include/Library/Layout/IUseLayoutAction.h
+++ b/lib/al/include/Library/Layout/IUseLayoutAction.h
--- a/lib/al/include/Library/Layout/LayoutActionFunction.h
+++ b/lib/al/include/Library/Layout/LayoutActionFunction.h
--- a/lib/al/include/Library/Layout/LayoutActionKeeper.h
+++ b/lib/al/include/Library/Layout/LayoutActionKeeper.h
--- a/lib/al/src/Library/Layout/LayoutActor.cpp
+++ b/lib/al/src/Library/Layout/LayoutActor.cpp
--- a/lib/al/include/Library/Layout/LayoutActor.h
+++ b/lib/al/include/Library/Layout/LayoutActor.h
--- a/lib/al/include/Library/Layout/LayoutActorGroup.h
+++ b/lib/al/include/Library/Layout/LayoutActorGroup.h
--- a/Show More
+++ b/Show More