From baff71cdc365cc49033b77632471ec0966d836be Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 19 Aug 2019 19:08:54 -0400 Subject: [PATCH] General: Tidy up includes Alphabetizes includes and resolves quite a few instances of indirect inclusions, making the requirements of several interfaces explicit. This also trims out includes that aren't actually necessary (likely due to changes in the API over time). --- include/boo/DeferredWindowEvents.hpp | 7 +++++-- include/boo/IApplication.hpp | 7 ++++--- include/boo/IGraphicsContext.hpp | 2 +- include/boo/IWindow.hpp | 5 +++-- include/boo/UWPViewProvider.hpp | 2 +- include/boo/audiodev/IAudioVoiceEngine.hpp | 12 +++++++---- include/boo/audiodev/IMIDIPort.hpp | 7 ++++--- include/boo/audiodev/IMIDIReader.hpp | 2 +- include/boo/audiodev/MIDIDecoder.hpp | 4 +--- include/boo/audiodev/MIDIEncoder.hpp | 1 - include/boo/boo.hpp | 2 +- include/boo/graphicsdev/D3D.hpp | 10 +++++----- include/boo/graphicsdev/GL.hpp | 9 +++++---- .../boo/graphicsdev/IGraphicsCommandQueue.hpp | 9 ++++++--- .../boo/graphicsdev/IGraphicsDataFactory.hpp | 9 +++++---- include/boo/graphicsdev/Metal.hpp | 6 ++++-- include/boo/graphicsdev/NX.hpp | 9 ++++++--- include/boo/graphicsdev/Vulkan.hpp | 14 ++++++------- include/boo/inputdev/DeviceBase.hpp | 7 ++++--- include/boo/inputdev/DeviceFinder.hpp | 1 + include/boo/inputdev/DeviceSignature.hpp | 5 +++-- include/boo/inputdev/DeviceToken.hpp | 6 ++++-- include/boo/inputdev/DolphinSmashAdapter.hpp | 5 +++-- include/boo/inputdev/DualshockPad.hpp | 5 +++-- include/boo/inputdev/GenericPad.hpp | 8 ++++---- include/boo/inputdev/HIDParser.hpp | 10 +++++++--- include/boo/inputdev/IHIDListener.hpp | 7 +++++-- include/boo/inputdev/XInputPad.hpp | 6 ++++-- lib/Common.hpp | 4 +++- lib/audiodev/AQS.cpp | 5 +++-- lib/audiodev/AudioMatrix.cpp | 4 ++-- lib/audiodev/AudioMatrix.hpp | 9 +++++---- lib/audiodev/AudioMatrixSSE.cpp | 5 ++--- lib/audiodev/AudioSubmix.cpp | 8 ++++---- lib/audiodev/AudioSubmix.hpp | 7 +++++-- lib/audiodev/AudioVoice.hpp | 10 ++++++---- lib/audiodev/AudioVoiceEngine.cpp | 4 +++- lib/audiodev/AudioVoiceEngine.hpp | 18 +++++++++++------ lib/audiodev/Common.hpp | 2 +- lib/audiodev/LinuxMidi.hpp | 8 +++++--- lib/audiodev/LtRtProcessing.hpp | 6 ++++-- lib/audiodev/MIDICommon.cpp | 3 ++- lib/audiodev/MIDIDecoder.cpp | 7 +++++-- lib/audiodev/MIDIEncoder.cpp | 4 +++- lib/audiodev/PulseAudio.cpp | 9 +++++---- lib/audiodev/WASAPI.cpp | 10 ++++++---- lib/audiodev/WAVOut.cpp | 7 +++++-- lib/graphicsdev/Common.hpp | 2 +- lib/graphicsdev/D3D11.cpp | 4 ++-- lib/graphicsdev/GL.cpp | 7 +++++-- lib/graphicsdev/GLX.cpp | 2 +- lib/graphicsdev/Metal.mm | 13 ++++++------ lib/graphicsdev/Vulkan.cpp | 13 +++++++----- lib/graphicsdev/nx/NX.cpp | 13 +++++++++--- lib/inputdev/DeviceBase.cpp | 3 +-- lib/inputdev/DeviceSignature.cpp | 2 +- lib/inputdev/DolphinSmashAdapter.cpp | 1 + lib/inputdev/DualshockPad.cpp | 5 +++-- lib/inputdev/HIDDeviceIOKit.cpp | 9 ++++++--- lib/inputdev/HIDDeviceNX.cpp | 2 +- lib/inputdev/HIDDeviceUWP.cpp | 4 +++- lib/inputdev/HIDDeviceUdev.cpp | 20 ++++++++++--------- lib/inputdev/HIDDeviceWinUSB.cpp | 3 ++- lib/inputdev/HIDListenerUWP.cpp | 1 + lib/inputdev/HIDListenerWinUSB.cpp | 7 +++++-- lib/inputdev/HIDParser.cpp | 4 +++- lib/inputdev/IHIDDevice.hpp | 5 +++-- lib/inputdev/IOKitPointer.hpp | 2 +- lib/inputdev/NintendoPowerA.cpp | 5 ++++- lib/mac/ApplicationCocoa.mm | 7 ++++--- lib/mac/CocoaCommon.hpp | 3 ++- lib/mac/WindowCocoa.mm | 2 +- lib/nx/WindowNX.cpp | 3 ++- lib/win/ApplicationUWP.cpp | 13 +++++++----- lib/win/ApplicationWin32.cpp | 17 +++++++++------- lib/win/UWPCommon.hpp | 2 +- lib/win/WinCommon.hpp | 4 ++++ lib/win/WindowUWP.cpp | 13 ++++++------ lib/win/WindowWin32.cpp | 17 +++++++++------- lib/x11/ApplicationUnix.cpp | 9 ++++++--- lib/x11/ApplicationXlib.hpp | 3 ++- lib/x11/WindowWayland.cpp | 1 + lib/x11/WindowXlib.cpp | 9 +++++---- test/main.cpp | 15 +++++++------- 84 files changed, 337 insertions(+), 215 deletions(-) diff --git a/include/boo/DeferredWindowEvents.hpp b/include/boo/DeferredWindowEvents.hpp index e095054..f0f5654 100644 --- a/include/boo/DeferredWindowEvents.hpp +++ b/include/boo/DeferredWindowEvents.hpp @@ -1,8 +1,11 @@ #pragma once -#include -#include +#include #include +#include +#include + +#include "boo/IWindow.hpp" #include "nxstl/condition_variable" namespace boo { diff --git a/include/boo/IApplication.hpp b/include/boo/IApplication.hpp index b254c54..36811fb 100644 --- a/include/boo/IApplication.hpp +++ b/include/boo/IApplication.hpp @@ -1,11 +1,12 @@ #pragma once #include -#include +#include #include -#include "IWindow.hpp" -#include "inputdev/DeviceFinder.hpp" +#include "boo/IWindow.hpp" +#include "boo/System.hpp" +#include "boo/inputdev/DeviceFinder.hpp" namespace boo { class IApplication; diff --git a/include/boo/IGraphicsContext.hpp b/include/boo/IGraphicsContext.hpp index cf01c0b..8053a52 100644 --- a/include/boo/IGraphicsContext.hpp +++ b/include/boo/IGraphicsContext.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace boo { struct IGraphicsCommandQueue; diff --git a/include/boo/IWindow.hpp b/include/boo/IWindow.hpp index af884da..f1c05c6 100644 --- a/include/boo/IWindow.hpp +++ b/include/boo/IWindow.hpp @@ -1,10 +1,11 @@ #pragma once -#include "System.hpp" -#include #include +#include #include +#include "boo/System.hpp" + #undef min #undef max diff --git a/include/boo/UWPViewProvider.hpp b/include/boo/UWPViewProvider.hpp index e01aedb..6f2016c 100644 --- a/include/boo/UWPViewProvider.hpp +++ b/include/boo/UWPViewProvider.hpp @@ -1,6 +1,6 @@ #pragma once -#include "IApplication.hpp" +#include "boo/IApplication.hpp" namespace boo { diff --git a/include/boo/audiodev/IAudioVoiceEngine.hpp b/include/boo/audiodev/IAudioVoiceEngine.hpp index f05e0de..b5ffcfe 100644 --- a/include/boo/audiodev/IAudioVoiceEngine.hpp +++ b/include/boo/audiodev/IAudioVoiceEngine.hpp @@ -1,12 +1,16 @@ #pragma once -#include "IAudioVoice.hpp" -#include "IAudioSubmix.hpp" -#include "IMIDIPort.hpp" -#include "boo/BooObject.hpp" +#include #include +#include +#include #include +#include "boo/BooObject.hpp" +#include "boo/audiodev/IAudioSubmix.hpp" +#include "boo/audiodev/IAudioVoice.hpp" +#include "boo/audiodev/IMIDIPort.hpp" + namespace boo { struct IAudioVoiceEngine; diff --git a/include/boo/audiodev/IMIDIPort.hpp b/include/boo/audiodev/IMIDIPort.hpp index 8661137..2f961a5 100644 --- a/include/boo/audiodev/IMIDIPort.hpp +++ b/include/boo/audiodev/IMIDIPort.hpp @@ -1,9 +1,10 @@ #pragma once -#include -#include -#include +#include #include +#include +#include +#include namespace boo { struct IAudioVoiceEngine; diff --git a/include/boo/audiodev/IMIDIReader.hpp b/include/boo/audiodev/IMIDIReader.hpp index 61e1d93..698d8f2 100644 --- a/include/boo/audiodev/IMIDIReader.hpp +++ b/include/boo/audiodev/IMIDIReader.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace boo { diff --git a/include/boo/audiodev/MIDIDecoder.hpp b/include/boo/audiodev/MIDIDecoder.hpp index 1263f0f..f4f3a99 100644 --- a/include/boo/audiodev/MIDIDecoder.hpp +++ b/include/boo/audiodev/MIDIDecoder.hpp @@ -1,11 +1,9 @@ #pragma once -#include "boo/audiodev/IMIDIReader.hpp" -#include "boo/audiodev/IMIDIPort.hpp" -#include #include namespace boo { +class IMIDIReader; class MIDIDecoder { IMIDIReader& m_out; diff --git a/include/boo/audiodev/MIDIEncoder.hpp b/include/boo/audiodev/MIDIEncoder.hpp index 13eb5ed..693152e 100644 --- a/include/boo/audiodev/MIDIEncoder.hpp +++ b/include/boo/audiodev/MIDIEncoder.hpp @@ -1,7 +1,6 @@ #pragma once #include "boo/audiodev/IMIDIReader.hpp" -#include "boo/audiodev/IMIDIPort.hpp" namespace boo { diff --git a/include/boo/boo.hpp b/include/boo/boo.hpp index 606bd65..bce6b07 100644 --- a/include/boo/boo.hpp +++ b/include/boo/boo.hpp @@ -1,5 +1,6 @@ #pragma once +#include "DeferredWindowEvents.hpp" #include "IApplication.hpp" #include "IWindow.hpp" #include "inputdev/DeviceFinder.hpp" @@ -9,4 +10,3 @@ #include "inputdev/NintendoPowerA.hpp" #include "graphicsdev/IGraphicsCommandQueue.hpp" #include "graphicsdev/IGraphicsDataFactory.hpp" -#include "DeferredWindowEvents.hpp" diff --git a/include/boo/graphicsdev/D3D.hpp b/include/boo/graphicsdev/D3D.hpp index ff716ab..95c7038 100644 --- a/include/boo/graphicsdev/D3D.hpp +++ b/include/boo/graphicsdev/D3D.hpp @@ -2,12 +2,12 @@ #if _WIN32 -#include "IGraphicsDataFactory.hpp" -#include "IGraphicsCommandQueue.hpp" -#include "boo/IGraphicsContext.hpp" -#include "boo/System.hpp" +#include #include -#include + +#include "boo/BooObject.hpp" +#include "boo/System.hpp" +#include "boo/graphicsdev/IGraphicsDataFactory.hpp" using pD3DCreateBlob = HRESULT(WINAPI*)(SIZE_T Size, ID3DBlob** ppBlob); extern pD3DCreateBlob D3DCreateBlobPROC; diff --git a/include/boo/graphicsdev/GL.hpp b/include/boo/graphicsdev/GL.hpp index 3b1d627..2485627 100644 --- a/include/boo/graphicsdev/GL.hpp +++ b/include/boo/graphicsdev/GL.hpp @@ -1,10 +1,11 @@ #pragma once #if BOO_HAS_GL -#include "IGraphicsDataFactory.hpp" -#include "IGraphicsCommandQueue.hpp" -#include "boo/IGraphicsContext.hpp" -#include "GLSLMacros.hpp" +#include + +#include "boo/BooObject.hpp" +#include "boo/graphicsdev/IGraphicsCommandQueue.hpp" +#include "boo/graphicsdev/IGraphicsDataFactory.hpp" namespace boo { struct BaseGraphicsData; diff --git a/include/boo/graphicsdev/IGraphicsCommandQueue.hpp b/include/boo/graphicsdev/IGraphicsCommandQueue.hpp index 65d82d5..7675a5d 100644 --- a/include/boo/graphicsdev/IGraphicsCommandQueue.hpp +++ b/include/boo/graphicsdev/IGraphicsCommandQueue.hpp @@ -1,9 +1,12 @@ #pragma once -#include "IGraphicsDataFactory.hpp" -#include "boo/IWindow.hpp" -#include #include +#include +#include + +#include "boo/BooObject.hpp" +#include "boo/IWindow.hpp" +#include "boo/graphicsdev/IGraphicsDataFactory.hpp" namespace boo { diff --git a/include/boo/graphicsdev/IGraphicsDataFactory.hpp b/include/boo/graphicsdev/IGraphicsDataFactory.hpp index 22f4713..6e6106c 100644 --- a/include/boo/graphicsdev/IGraphicsDataFactory.hpp +++ b/include/boo/graphicsdev/IGraphicsDataFactory.hpp @@ -1,12 +1,13 @@ #pragma once -#include -#include +#include #include +#include +#include #include -#include "boo/System.hpp" -#include "boo/ThreadLocalPtr.hpp" + #include "boo/BooObject.hpp" +#include "boo/System.hpp" #ifdef __SWITCH__ #include diff --git a/include/boo/graphicsdev/Metal.hpp b/include/boo/graphicsdev/Metal.hpp index d4a26ec..c98d250 100644 --- a/include/boo/graphicsdev/Metal.hpp +++ b/include/boo/graphicsdev/Metal.hpp @@ -2,9 +2,11 @@ #ifdef __APPLE__ #if BOO_HAS_METAL -#include "IGraphicsDataFactory.hpp" -#include "IGraphicsCommandQueue.hpp" +#include "boo/BooObject.hpp" #include "boo/IGraphicsContext.hpp" +#include "boo/System.hpp" +#include "boo/graphicsdev/IGraphicsCommandQueue.hpp" +#include "boo/graphicsdev/IGraphicsDataFactory.hpp" namespace boo { struct BaseGraphicsData; diff --git a/include/boo/graphicsdev/NX.hpp b/include/boo/graphicsdev/NX.hpp index 745544c..a74b60f 100644 --- a/include/boo/graphicsdev/NX.hpp +++ b/include/boo/graphicsdev/NX.hpp @@ -1,9 +1,12 @@ #pragma once #if BOO_HAS_NX -#include "IGraphicsDataFactory.hpp" -#include "IGraphicsCommandQueue.hpp" -#include "nx_compiler.hpp" +#include + +#include "boo/BooObject.hpp" +#include "boo/graphicsdev/IGraphicsCommandQueue.hpp" +#include "boo/graphicsdev/IGraphicsDataFactory.hpp" +#include "boo/graphicsdev/nx_compiler.hpp" #include diff --git a/include/boo/graphicsdev/Vulkan.hpp b/include/boo/graphicsdev/Vulkan.hpp index ff4d3ae..e073051 100644 --- a/include/boo/graphicsdev/Vulkan.hpp +++ b/include/boo/graphicsdev/Vulkan.hpp @@ -1,15 +1,15 @@ #pragma once #if BOO_HAS_VULKAN -#include "IGraphicsDataFactory.hpp" -#include "IGraphicsCommandQueue.hpp" -#include "boo/IGraphicsContext.hpp" -#include "GLSLMacros.hpp" -#include -#include -#include #include #include +#include +#include + +#include "boo/BooObject.hpp" +#include "boo/IGraphicsContext.hpp" +#include "boo/System.hpp" +#include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "boo/graphicsdev/VulkanDispatchTable.hpp" /* Forward-declare handle type for Vulkan Memory Allocator */ diff --git a/include/boo/inputdev/DeviceBase.hpp b/include/boo/inputdev/DeviceBase.hpp index 4de7b5b..39f7137 100644 --- a/include/boo/inputdev/DeviceBase.hpp +++ b/include/boo/inputdev/DeviceBase.hpp @@ -1,11 +1,12 @@ #pragma once -#include -#include +#include #include +#include #include -#include #include +#include + #include "nxstl/mutex" #include "boo/System.hpp" diff --git a/include/boo/inputdev/DeviceFinder.hpp b/include/boo/inputdev/DeviceFinder.hpp index ede8b11..901198c 100644 --- a/include/boo/inputdev/DeviceFinder.hpp +++ b/include/boo/inputdev/DeviceFinder.hpp @@ -4,6 +4,7 @@ #include #include #include + #include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/IHIDListener.hpp" diff --git a/include/boo/inputdev/DeviceSignature.hpp b/include/boo/inputdev/DeviceSignature.hpp index d3d691d..d987b14 100644 --- a/include/boo/inputdev/DeviceSignature.hpp +++ b/include/boo/inputdev/DeviceSignature.hpp @@ -1,10 +1,11 @@ #pragma once -#include +#include #include -#include #include #include +#include +#include namespace boo { diff --git a/include/boo/inputdev/DeviceToken.hpp b/include/boo/inputdev/DeviceToken.hpp index b70a749..60ff183 100644 --- a/include/boo/inputdev/DeviceToken.hpp +++ b/include/boo/inputdev/DeviceToken.hpp @@ -1,8 +1,10 @@ #pragma once +#include #include -#include "DeviceBase.hpp" -#include "DeviceSignature.hpp" + +#include "boo/inputdev/DeviceBase.hpp" +#include "boo/inputdev/DeviceSignature.hpp" namespace boo { diff --git a/include/boo/inputdev/DolphinSmashAdapter.hpp b/include/boo/inputdev/DolphinSmashAdapter.hpp index e96e60f..a3b06c6 100644 --- a/include/boo/inputdev/DolphinSmashAdapter.hpp +++ b/include/boo/inputdev/DolphinSmashAdapter.hpp @@ -1,8 +1,9 @@ #pragma once #include -#include "DeviceBase.hpp" -#include "../System.hpp" + +#include "boo/System.hpp" +#include "boo/inputdev/DeviceBase.hpp" namespace boo { diff --git a/include/boo/inputdev/DualshockPad.hpp b/include/boo/inputdev/DualshockPad.hpp index b8b2ed4..77f39e0 100644 --- a/include/boo/inputdev/DualshockPad.hpp +++ b/include/boo/inputdev/DualshockPad.hpp @@ -1,8 +1,9 @@ #pragma once + #include -#include -#include "DeviceBase.hpp" + #include "boo/System.hpp" +#include "boo/inputdev/DeviceBase.hpp" namespace boo { diff --git a/include/boo/inputdev/GenericPad.hpp b/include/boo/inputdev/GenericPad.hpp index 41474f8..6f965f3 100644 --- a/include/boo/inputdev/GenericPad.hpp +++ b/include/boo/inputdev/GenericPad.hpp @@ -1,9 +1,9 @@ #pragma once -#include "DeviceBase.hpp" -#include "HIDParser.hpp" -#include -#include +#include + +#include "boo/inputdev/DeviceBase.hpp" +#include "boo/inputdev/HIDParser.hpp" namespace boo { diff --git a/include/boo/inputdev/HIDParser.hpp b/include/boo/inputdev/HIDParser.hpp index 00a4cca..7a623ea 100644 --- a/include/boo/inputdev/HIDParser.hpp +++ b/include/boo/inputdev/HIDParser.hpp @@ -1,10 +1,14 @@ #pragma once -#include "boo/System.hpp" -#include -#include +#include +#include #include #include +#include +#include +#include + +#include "boo/System.hpp" #if _WIN32 #include diff --git a/include/boo/inputdev/IHIDListener.hpp b/include/boo/inputdev/IHIDListener.hpp index e81f9b8..4971a60 100644 --- a/include/boo/inputdev/IHIDListener.hpp +++ b/include/boo/inputdev/IHIDListener.hpp @@ -1,8 +1,11 @@ #pragma once -#include +#include #include -#include "DeviceToken.hpp" +#include +#include + +#include "boo/inputdev/DeviceToken.hpp" namespace boo { class DeviceFinder; diff --git a/include/boo/inputdev/XInputPad.hpp b/include/boo/inputdev/XInputPad.hpp index 87f353c..f561482 100644 --- a/include/boo/inputdev/XInputPad.hpp +++ b/include/boo/inputdev/XInputPad.hpp @@ -1,8 +1,10 @@ #pragma once -#include "DeviceBase.hpp" -#include "DeviceSignature.hpp" +#include + #include "boo/System.hpp" +#include "boo/inputdev/DeviceBase.hpp" +#include "boo/inputdev/DeviceSignature.hpp" namespace boo { diff --git a/lib/Common.hpp b/lib/Common.hpp index 63a8d5e..803a4fd 100644 --- a/lib/Common.hpp +++ b/lib/Common.hpp @@ -1,8 +1,10 @@ #pragma once -#include "boo/BooObject.hpp" +#include #include +#include "boo/BooObject.hpp" + namespace boo { /** Linked-list iterator shareable by ListNode types. */ diff --git a/lib/audiodev/AQS.cpp b/lib/audiodev/AQS.cpp index 412ba45..1d6bf12 100644 --- a/lib/audiodev/AQS.cpp +++ b/lib/audiodev/AQS.cpp @@ -1,6 +1,7 @@ -#include "AudioVoiceEngine.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" + #include "boo/IApplication.hpp" -#include "../CFPointer.hpp" +#include "lib/CFPointer.hpp" #include #include diff --git a/lib/audiodev/AudioMatrix.cpp b/lib/audiodev/AudioMatrix.cpp index f64f3d6..84721de 100644 --- a/lib/audiodev/AudioMatrix.cpp +++ b/lib/audiodev/AudioMatrix.cpp @@ -1,5 +1,5 @@ -#include "AudioMatrix.hpp" -#include "AudioVoiceEngine.hpp" +#include "lib/audiodev/AudioMatrix.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" #include namespace boo { diff --git a/lib/audiodev/AudioMatrix.hpp b/lib/audiodev/AudioMatrix.hpp index a593e17..931295d 100644 --- a/lib/audiodev/AudioMatrix.hpp +++ b/lib/audiodev/AudioMatrix.hpp @@ -1,10 +1,11 @@ #pragma once -#include "boo/audiodev/IAudioVoice.hpp" -#include -#include -#include #include +#include +#include +#include + +#include "boo/audiodev/IAudioVoice.hpp" #if __SSE__ #include diff --git a/lib/audiodev/AudioMatrixSSE.cpp b/lib/audiodev/AudioMatrixSSE.cpp index af83a60..ac8b6de 100644 --- a/lib/audiodev/AudioMatrixSSE.cpp +++ b/lib/audiodev/AudioMatrixSSE.cpp @@ -1,6 +1,5 @@ -#include "AudioMatrix.hpp" -#include "AudioVoiceEngine.hpp" -#include +#include "lib/audiodev/AudioMatrix.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" #include diff --git a/lib/audiodev/AudioSubmix.cpp b/lib/audiodev/AudioSubmix.cpp index 66b7f66..ca9ddd7 100644 --- a/lib/audiodev/AudioSubmix.cpp +++ b/lib/audiodev/AudioSubmix.cpp @@ -1,7 +1,7 @@ -#include "AudioSubmix.hpp" -#include "AudioVoiceEngine.hpp" -#include "AudioVoice.hpp" -#include +#include "lib/audiodev/AudioSubmix.hpp" +#include "lib/audiodev/AudioVoice.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" + #include #undef min diff --git a/lib/audiodev/AudioSubmix.hpp b/lib/audiodev/AudioSubmix.hpp index 5b5b87b..96db4d7 100644 --- a/lib/audiodev/AudioSubmix.hpp +++ b/lib/audiodev/AudioSubmix.hpp @@ -1,12 +1,15 @@ #pragma once -#include "boo/audiodev/IAudioSubmix.hpp" #include +#include +#include #include #include #include #include -#include "Common.hpp" + +#include "boo/audiodev/IAudioSubmix.hpp" +#include "lib/audiodev/Common.hpp" #if __SSE__ #include diff --git a/lib/audiodev/AudioVoice.hpp b/lib/audiodev/AudioVoice.hpp index 5ff996f..495a396 100644 --- a/lib/audiodev/AudioVoice.hpp +++ b/lib/audiodev/AudioVoice.hpp @@ -1,12 +1,14 @@ #pragma once -#include #include #include + #include "boo/audiodev/IAudioVoice.hpp" -#include "AudioMatrix.hpp" -#include "AudioVoiceEngine.hpp" -#include "Common.hpp" +#include "lib/audiodev/AudioMatrix.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" +#include "lib/audiodev/Common.hpp" + +#include struct AudioUnitVoiceEngine; struct VSTVoiceEngine; diff --git a/lib/audiodev/AudioVoiceEngine.cpp b/lib/audiodev/AudioVoiceEngine.cpp index e2e3fc9..f89f376 100644 --- a/lib/audiodev/AudioVoiceEngine.cpp +++ b/lib/audiodev/AudioVoiceEngine.cpp @@ -1,5 +1,7 @@ -#include "AudioVoiceEngine.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" + #include +#include namespace boo { diff --git a/lib/audiodev/AudioVoiceEngine.hpp b/lib/audiodev/AudioVoiceEngine.hpp index d1fe7b6..e236c6c 100644 --- a/lib/audiodev/AudioVoiceEngine.hpp +++ b/lib/audiodev/AudioVoiceEngine.hpp @@ -1,12 +1,18 @@ #pragma once -#include "boo/audiodev/IAudioVoiceEngine.hpp" -#include "LtRtProcessing.hpp" -#include "Common.hpp" -#include "AudioVoice.hpp" -#include "AudioSubmix.hpp" -#include +#include +#include +#include +#include #include +#include + +#include "boo/BooObject.hpp" +#include "boo/audiodev/IAudioVoiceEngine.hpp" +#include "lib/audiodev/AudioSubmix.hpp" +#include "lib/audiodev/AudioVoice.hpp" +#include "lib/audiodev/Common.hpp" +#include "lib/audiodev/LtRtProcessing.hpp" namespace boo { diff --git a/lib/audiodev/Common.hpp b/lib/audiodev/Common.hpp index c0bd49c..d94daaf 100644 --- a/lib/audiodev/Common.hpp +++ b/lib/audiodev/Common.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include "../Common.hpp" #include "boo/audiodev/IAudioVoice.hpp" +#include "lib/Common.hpp" namespace boo { diff --git a/lib/audiodev/LinuxMidi.hpp b/lib/audiodev/LinuxMidi.hpp index ceec7c1..15332b4 100644 --- a/lib/audiodev/LinuxMidi.hpp +++ b/lib/audiodev/LinuxMidi.hpp @@ -1,11 +1,13 @@ #pragma once -#include "AudioVoiceEngine.hpp" -#include "logvisor/logvisor.hpp" +#include #include +#include + +#include "lib/audiodev/AudioVoiceEngine.hpp" #include -#include +#include namespace boo { extern logvisor::Module ALSALog; diff --git a/lib/audiodev/LtRtProcessing.hpp b/lib/audiodev/LtRtProcessing.hpp index 43ee660..c458b79 100644 --- a/lib/audiodev/LtRtProcessing.hpp +++ b/lib/audiodev/LtRtProcessing.hpp @@ -1,9 +1,11 @@ #pragma once +#include +#include + #include "boo/System.hpp" #include "boo/audiodev/IAudioVoice.hpp" -#include "Common.hpp" -#include +#include "lib/audiodev/Common.hpp" #if INTEL_IPP #include "ipp.h" diff --git a/lib/audiodev/MIDICommon.cpp b/lib/audiodev/MIDICommon.cpp index 468379a..00bfb11 100644 --- a/lib/audiodev/MIDICommon.cpp +++ b/lib/audiodev/MIDICommon.cpp @@ -1,4 +1,5 @@ -#include "MIDICommon.hpp" +#include "lib/audiodev/MIDICommon.hpp" + #include "boo/audiodev/IMIDIPort.hpp" namespace boo { diff --git a/lib/audiodev/MIDIDecoder.cpp b/lib/audiodev/MIDIDecoder.cpp index 57fc9e7..e469fb8 100644 --- a/lib/audiodev/MIDIDecoder.cpp +++ b/lib/audiodev/MIDIDecoder.cpp @@ -1,8 +1,11 @@ #include "boo/audiodev/MIDIDecoder.hpp" -#include "MIDICommon.hpp" -#include + #include +#include "boo/audiodev/IMIDIReader.hpp" +#include "lib/audiodev/MIDICommon.hpp" + + namespace boo { constexpr uint8_t clamp7(uint8_t val) { return std::max(0, std::min(127, int(val))); } diff --git a/lib/audiodev/MIDIEncoder.cpp b/lib/audiodev/MIDIEncoder.cpp index f13a395..925026c 100644 --- a/lib/audiodev/MIDIEncoder.cpp +++ b/lib/audiodev/MIDIEncoder.cpp @@ -1,5 +1,7 @@ #include "boo/audiodev/MIDIEncoder.hpp" -#include "MIDICommon.hpp" + +#include "boo/audiodev/IMIDIPort.hpp" +#include "lib/audiodev/MIDICommon.hpp" namespace boo { diff --git a/lib/audiodev/PulseAudio.cpp b/lib/audiodev/PulseAudio.cpp index c80d9ee..4033f5e 100644 --- a/lib/audiodev/PulseAudio.cpp +++ b/lib/audiodev/PulseAudio.cpp @@ -1,8 +1,9 @@ -#include "AudioVoiceEngine.hpp" -#include "logvisor/logvisor.hpp" -#include "boo/boo.hpp" -#include "LinuxMidi.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" +#include "boo/boo.hpp" +#include "lib/audiodev/LinuxMidi.hpp" + +#include #include #include diff --git a/lib/audiodev/WASAPI.cpp b/lib/audiodev/WASAPI.cpp index 0e9d62f..a16b99b 100644 --- a/lib/audiodev/WASAPI.cpp +++ b/lib/audiodev/WASAPI.cpp @@ -1,14 +1,16 @@ -#include "../win/Win32Common.hpp" -#include "AudioVoiceEngine.hpp" -#include "logvisor/logvisor.hpp" +#include "lib/win/Win32Common.hpp" + +#include + #include "boo/IApplication.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" #include #include #include #include -#include +#include #ifdef TE_VIRTUAL_MIDI #include diff --git a/lib/audiodev/WAVOut.cpp b/lib/audiodev/WAVOut.cpp index eaa9949..a600d3a 100644 --- a/lib/audiodev/WAVOut.cpp +++ b/lib/audiodev/WAVOut.cpp @@ -1,6 +1,9 @@ -#include "AudioVoiceEngine.hpp" -#include "logvisor/logvisor.hpp" +#include "lib/audiodev/AudioVoiceEngine.hpp" + +#include + #include "boo/audiodev/IAudioVoiceEngine.hpp" +#include namespace boo { diff --git a/lib/graphicsdev/Common.hpp b/lib/graphicsdev/Common.hpp index 5362ff0..c589343 100644 --- a/lib/graphicsdev/Common.hpp +++ b/lib/graphicsdev/Common.hpp @@ -14,7 +14,7 @@ #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "boo/graphicsdev/IGraphicsCommandQueue.hpp" -#include "../Common.hpp" +#include "lib/Common.hpp" namespace boo { diff --git a/lib/graphicsdev/D3D11.cpp b/lib/graphicsdev/D3D11.cpp index c8bced6..05f0c0d 100644 --- a/lib/graphicsdev/D3D11.cpp +++ b/lib/graphicsdev/D3D11.cpp @@ -1,12 +1,12 @@ #include "../win/Win32Common.hpp" #include "boo/graphicsdev/D3D.hpp" +#include "boo/graphicsdev/IGraphicsCommandQueue.hpp" #include "boo/IGraphicsContext.hpp" -#include "Common.hpp" +#include "lib/graphicsdev/Common.hpp" #include #include #include -#include #include #include #include diff --git a/lib/graphicsdev/GL.cpp b/lib/graphicsdev/GL.cpp index 23c465a..0d91577 100644 --- a/lib/graphicsdev/GL.cpp +++ b/lib/graphicsdev/GL.cpp @@ -1,7 +1,10 @@ #include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/glew.h" +#include "boo/graphicsdev/GLSLMacros.hpp" + #include "boo/IApplication.hpp" -#include "Common.hpp" +#include "boo/IGraphicsContext.hpp" +#include "lib/graphicsdev/Common.hpp" #include #include @@ -15,7 +18,7 @@ #include #if _WIN32 -#include "../win/WinCommon.hpp" +#include "lib/win/WinCommon.hpp" #endif #undef min diff --git a/lib/graphicsdev/GLX.cpp b/lib/graphicsdev/GLX.cpp index dc9617b..572b6ca 100644 --- a/lib/graphicsdev/GLX.cpp +++ b/lib/graphicsdev/GLX.cpp @@ -1,5 +1,5 @@ #include "boo/graphicsdev/glxew.h" -#include "logvisor/logvisor.hpp" +#include namespace boo { static logvisor::Module Log("boo::GLX"); diff --git a/lib/graphicsdev/Metal.mm b/lib/graphicsdev/Metal.mm index ab383f0..0d476fc 100644 --- a/lib/graphicsdev/Metal.mm +++ b/lib/graphicsdev/Metal.mm @@ -1,16 +1,17 @@ -#include "../mac/CocoaCommon.hpp" +#include "lib/mac/CocoaCommon.hpp" #if BOO_HAS_METAL -#include "logvisor/logvisor.hpp" #include "boo/IApplication.hpp" -#include "boo/graphicsdev/Metal.hpp" #include "boo/IGraphicsContext.hpp" -#include "Common.hpp" -#include +#include "boo/graphicsdev/Metal.hpp" +#include "lib/graphicsdev/Common.hpp" + #include #include -#include "xxhash/xxhash.h" +#include + +#include #if !__has_feature(objc_arc) #error ARC Required diff --git a/lib/graphicsdev/Vulkan.cpp b/lib/graphicsdev/Vulkan.cpp index ed0aa05..e687fb6 100644 --- a/lib/graphicsdev/Vulkan.cpp +++ b/lib/graphicsdev/Vulkan.cpp @@ -1,15 +1,18 @@ #include "boo/graphicsdev/Vulkan.hpp" -#include "boo/IGraphicsContext.hpp" -#include + #include #include +#include + #include #include #include #include + +#include "boo/IGraphicsContext.hpp" #include "boo/graphicsdev/GLSLMacros.hpp" -#include "Common.hpp" -#include "xxhash/xxhash.h" +#include "boo/graphicsdev/IGraphicsCommandQueue.hpp" +#include "lib/graphicsdev/Common.hpp" #define AMD_PAL_HACK 1 @@ -17,7 +20,7 @@ #define VMA_STATIC_VULKAN_FUNCTIONS 0 #include "vk_mem_alloc.h" -#include "logvisor/logvisor.hpp" +#include #define BOO_VK_MAX_DESCRIPTOR_SETS 65536 diff --git a/lib/graphicsdev/nx/NX.cpp b/lib/graphicsdev/nx/NX.cpp index 3a98f09..3ca049d 100644 --- a/lib/graphicsdev/nx/NX.cpp +++ b/lib/graphicsdev/nx/NX.cpp @@ -1,9 +1,13 @@ -#include "logvisor/logvisor.hpp" #include "boo/graphicsdev/NX.hpp" + +#include +#include +#include +#include + #include "boo/IGraphicsContext.hpp" #include "boo/graphicsdev/GLSLMacros.hpp" -#include "../Common.hpp" -#include "xxhash/xxhash.h" +#include "lib/graphicsdev/Common.hpp" #include "main/shaderobj.h" #include "st_program.h" @@ -19,6 +23,9 @@ extern "C" { #include "gallium/winsys/nouveau/switch/nouveau_switch_public.h" } +#include +#include + #include namespace boo { diff --git a/lib/inputdev/DeviceBase.cpp b/lib/inputdev/DeviceBase.cpp index 29d4412..7d483c8 100644 --- a/lib/inputdev/DeviceBase.cpp +++ b/lib/inputdev/DeviceBase.cpp @@ -1,7 +1,6 @@ #include "boo/inputdev/DeviceBase.hpp" #include "boo/inputdev/DeviceToken.hpp" -#include "IHIDDevice.hpp" -#include +#include "lib/inputdev/IHIDDevice.hpp" namespace boo { diff --git a/lib/inputdev/DeviceSignature.cpp b/lib/inputdev/DeviceSignature.cpp index f2474ef..29646dc 100644 --- a/lib/inputdev/DeviceSignature.cpp +++ b/lib/inputdev/DeviceSignature.cpp @@ -1,7 +1,7 @@ #include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/GenericPad.hpp" -#include "IHIDDevice.hpp" +#include "lib/inputdev/IHIDDevice.hpp" namespace boo { diff --git a/lib/inputdev/DolphinSmashAdapter.cpp b/lib/inputdev/DolphinSmashAdapter.cpp index 41702ae..a22331b 100644 --- a/lib/inputdev/DolphinSmashAdapter.cpp +++ b/lib/inputdev/DolphinSmashAdapter.cpp @@ -1,5 +1,6 @@ #include "boo/inputdev/DolphinSmashAdapter.hpp" #include "boo/inputdev/DeviceSignature.hpp" + #include #include diff --git a/lib/inputdev/DualshockPad.cpp b/lib/inputdev/DualshockPad.cpp index 818c2df..6d24890 100644 --- a/lib/inputdev/DualshockPad.cpp +++ b/lib/inputdev/DualshockPad.cpp @@ -1,10 +1,11 @@ #include "boo/inputdev/DualshockPad.hpp" #include "boo/inputdev/DeviceSignature.hpp" + #define _USE_MATH_DEFINES #include -#include #include -#include +#include +#include #ifdef _MSC_VER inline uint16_t bswap16(uint16_t val) { return _byteswap_ushort(val); } diff --git a/lib/inputdev/HIDDeviceIOKit.cpp b/lib/inputdev/HIDDeviceIOKit.cpp index 5ae6269..4bf4328 100644 --- a/lib/inputdev/HIDDeviceIOKit.cpp +++ b/lib/inputdev/HIDDeviceIOKit.cpp @@ -1,9 +1,12 @@ -#include "IHIDDevice.hpp" +#include "lib/inputdev/IHIDDevice.hpp" + +#include + +#include "lib/inputdev/IOKitPointer.hpp" + #include #include #include -#include "IOKitPointer.hpp" -#include namespace boo { diff --git a/lib/inputdev/HIDDeviceNX.cpp b/lib/inputdev/HIDDeviceNX.cpp index 1edc179..3b93ae1 100644 --- a/lib/inputdev/HIDDeviceNX.cpp +++ b/lib/inputdev/HIDDeviceNX.cpp @@ -1,4 +1,4 @@ -#include "IHIDDevice.hpp" +#include "lib/inputdev/IHIDDevice.hpp" namespace boo { diff --git a/lib/inputdev/HIDDeviceUWP.cpp b/lib/inputdev/HIDDeviceUWP.cpp index fb34186..cee2206 100644 --- a/lib/inputdev/HIDDeviceUWP.cpp +++ b/lib/inputdev/HIDDeviceUWP.cpp @@ -1,5 +1,7 @@ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ -#include "IHIDDevice.hpp" + +#include "lib/inputdev/IHIDDevice.hpp" + #include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceBase.hpp" diff --git a/lib/inputdev/HIDDeviceUdev.cpp b/lib/inputdev/HIDDeviceUdev.cpp index 6e2144c..6227060 100644 --- a/lib/inputdev/HIDDeviceUdev.cpp +++ b/lib/inputdev/HIDDeviceUdev.cpp @@ -1,22 +1,24 @@ -#include "IHIDDevice.hpp" +#include "lib/inputdev/IHIDDevice.hpp" + +#include +#include +#include +#include +#include + #include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceBase.hpp" -#include -#include -#include +#include "boo/inputdev/HIDParser.hpp" -#include +#include #include -#include #include #include #include #include -#include +#include #include #include -#include -#include "boo/inputdev/HIDParser.hpp" namespace boo { diff --git a/lib/inputdev/HIDDeviceWinUSB.cpp b/lib/inputdev/HIDDeviceWinUSB.cpp index d63b586..b23dcbf 100644 --- a/lib/inputdev/HIDDeviceWinUSB.cpp +++ b/lib/inputdev/HIDDeviceWinUSB.cpp @@ -1,5 +1,6 @@ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ -#include "IHIDDevice.hpp" +#include "lib/inputdev/IHIDDevice.hpp" + #include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceBase.hpp" diff --git a/lib/inputdev/HIDListenerUWP.cpp b/lib/inputdev/HIDListenerUWP.cpp index a7438b6..3888e54 100644 --- a/lib/inputdev/HIDListenerUWP.cpp +++ b/lib/inputdev/HIDListenerUWP.cpp @@ -1,4 +1,5 @@ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ + #include "boo/inputdev/IHIDListener.hpp" #include "boo/inputdev/DeviceFinder.hpp" diff --git a/lib/inputdev/HIDListenerWinUSB.cpp b/lib/inputdev/HIDListenerWinUSB.cpp index b05f1d7..9736433 100644 --- a/lib/inputdev/HIDListenerWinUSB.cpp +++ b/lib/inputdev/HIDListenerWinUSB.cpp @@ -1,10 +1,13 @@ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ + #include "boo/inputdev/IHIDListener.hpp" -#include "boo/inputdev/DeviceFinder.hpp" -#include "boo/inputdev/XInputPad.hpp" + #include #include +#include "boo/inputdev/DeviceFinder.hpp" +#include "boo/inputdev/XInputPad.hpp" + #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif diff --git a/lib/inputdev/HIDParser.cpp b/lib/inputdev/HIDParser.cpp index a4f505b..2442d34 100644 --- a/lib/inputdev/HIDParser.cpp +++ b/lib/inputdev/HIDParser.cpp @@ -1,6 +1,8 @@ #include "boo/inputdev/HIDParser.hpp" -#include + #include +#include +#include #undef min #undef max diff --git a/lib/inputdev/IHIDDevice.hpp b/lib/inputdev/IHIDDevice.hpp index 856477c..8a0e6de 100644 --- a/lib/inputdev/IHIDDevice.hpp +++ b/lib/inputdev/IHIDDevice.hpp @@ -1,9 +1,10 @@ #pragma once -#include "boo/inputdev/DeviceToken.hpp" -#include "boo/inputdev/DeviceBase.hpp" #include +#include "boo/inputdev/DeviceBase.hpp" +#include "boo/inputdev/DeviceToken.hpp" + #if _WIN32 #include #endif diff --git a/lib/inputdev/IOKitPointer.hpp b/lib/inputdev/IOKitPointer.hpp index 9340f2d..6d8c8b6 100644 --- a/lib/inputdev/IOKitPointer.hpp +++ b/lib/inputdev/IOKitPointer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../CFPointer.hpp" +#include "lib/CFPointer.hpp" #include #include #include diff --git a/lib/inputdev/NintendoPowerA.cpp b/lib/inputdev/NintendoPowerA.cpp index 0c1e944..fbc46dd 100644 --- a/lib/inputdev/NintendoPowerA.cpp +++ b/lib/inputdev/NintendoPowerA.cpp @@ -1,6 +1,9 @@ #include "boo/inputdev/NintendoPowerA.hpp" + +#include + #include "boo/inputdev/DeviceSignature.hpp" -#include + namespace boo { NintendoPowerA::NintendoPowerA(DeviceToken* token) : TDeviceBase(dev_typeid(NintendoPowerA), token) {} diff --git a/lib/mac/ApplicationCocoa.mm b/lib/mac/ApplicationCocoa.mm index f328108..577d95a 100644 --- a/lib/mac/ApplicationCocoa.mm +++ b/lib/mac/ApplicationCocoa.mm @@ -1,12 +1,13 @@ #include + #include #include "boo/IApplication.hpp" #include "boo/graphicsdev/Metal.hpp" -#include "CocoaCommon.hpp" -#include "../Common.hpp" +#include "lib/Common.hpp" +#include "lib/mac/CocoaCommon.hpp" -#include "logvisor/logvisor.hpp" +#include #if !__has_feature(objc_arc) #error ARC Required diff --git a/lib/mac/CocoaCommon.hpp b/lib/mac/CocoaCommon.hpp index dc08ba6..fecf3cb 100644 --- a/lib/mac/CocoaCommon.hpp +++ b/lib/mac/CocoaCommon.hpp @@ -9,8 +9,9 @@ #include #include -#include + #include +#include namespace boo { class IWindow; diff --git a/lib/mac/WindowCocoa.mm b/lib/mac/WindowCocoa.mm index 3fb4e23..68ff13b 100644 --- a/lib/mac/WindowCocoa.mm +++ b/lib/mac/WindowCocoa.mm @@ -1,10 +1,10 @@ #include "boo/graphicsdev/Metal.hpp" -#include "CocoaCommon.hpp" #include "boo/IApplication.hpp" #include "boo/IGraphicsContext.hpp" #include "boo/IWindow.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp" +#include "lib/mac/CocoaCommon.hpp" #include #include diff --git a/lib/nx/WindowNX.cpp b/lib/nx/WindowNX.cpp index a05f404..d8ba12a 100644 --- a/lib/nx/WindowNX.cpp +++ b/lib/nx/WindowNX.cpp @@ -1,8 +1,9 @@ #include "boo/IWindow.hpp" + #include "boo/IGraphicsContext.hpp" -#include "logvisor/logvisor.hpp" #include "boo/graphicsdev/NX.hpp" +#include #include namespace boo { diff --git a/lib/win/ApplicationUWP.cpp b/lib/win/ApplicationUWP.cpp index 83879b8..d0bd8e8 100644 --- a/lib/win/ApplicationUWP.cpp +++ b/lib/win/ApplicationUWP.cpp @@ -1,4 +1,4 @@ -#include "UWPCommon.hpp" +#include "lib/win/UWPCommon.hpp" using namespace Windows::Foundation; using namespace Windows::UI::Core; @@ -12,12 +12,15 @@ using namespace Platform; #define D3D11_CREATE_DEVICE_FLAGS 0 #endif -#include "boo/System.hpp" +#include + #include "boo/IApplication.hpp" -#include "boo/inputdev/DeviceFinder.hpp" -#include "boo/graphicsdev/D3D.hpp" -#include "logvisor/logvisor.hpp" +#include "boo/System.hpp" #include "boo/UWPViewProvider.hpp" +#include "boo/graphicsdev/D3D.hpp" +#include "boo/inputdev/DeviceFinder.hpp" + +#include #if _WIN32_WINNT_WIN10 PFN_D3D12_SERIALIZE_ROOT_SIGNATURE D3D12SerializeRootSignaturePROC = nullptr; diff --git a/lib/win/ApplicationWin32.cpp b/lib/win/ApplicationWin32.cpp index 27624b7..8bc4e0c 100644 --- a/lib/win/ApplicationWin32.cpp +++ b/lib/win/ApplicationWin32.cpp @@ -1,4 +1,5 @@ -#include "Win32Common.hpp" +#include "lib/win/Win32Common.hpp" + #include #include #include @@ -15,19 +16,21 @@ PFN_GetScaleFactorForMonitor MyGetScaleFactorForMonitor = nullptr; #define D3D11_CREATE_DEVICE_FLAGS 0 #endif -#include "boo/System.hpp" +#include +#include +#include + #include "boo/IApplication.hpp" -#include "boo/inputdev/DeviceFinder.hpp" +#include "boo/System.hpp" #include "boo/graphicsdev/D3D.hpp" -#include "logvisor/logvisor.hpp" +#include "boo/inputdev/DeviceFinder.hpp" + +#include #if BOO_HAS_VULKAN #include "boo/graphicsdev/Vulkan.hpp" #endif -#include -#include - DWORD g_mainThreadId = 0; std::mutex g_nwmt; std::condition_variable g_nwcv; diff --git a/lib/win/UWPCommon.hpp b/lib/win/UWPCommon.hpp index 399fe0c..7d53c76 100644 --- a/lib/win/UWPCommon.hpp +++ b/lib/win/UWPCommon.hpp @@ -1,6 +1,6 @@ #pragma once -#include "WinCommon.hpp" +#include "lib/win/WinCommon.hpp" struct Boo3DAppContextUWP : Boo3DAppContext { bool isFullscreen(const boo::IWindow* window) { diff --git a/lib/win/WinCommon.hpp b/lib/win/WinCommon.hpp index 7573914..41c5f53 100644 --- a/lib/win/WinCommon.hpp +++ b/lib/win/WinCommon.hpp @@ -1,6 +1,10 @@ #pragma once +#include +#include +#include #include + #include "boo/IWindow.hpp" namespace boo { diff --git a/lib/win/WindowUWP.cpp b/lib/win/WindowUWP.cpp index da85ee7..714e6bf 100644 --- a/lib/win/WindowUWP.cpp +++ b/lib/win/WindowUWP.cpp @@ -1,11 +1,12 @@ -#include "UWPCommon.hpp" -#include "boo/IApplication.hpp" -#include "boo/IWindow.hpp" -#include "boo/IGraphicsContext.hpp" -#include "logvisor/logvisor.hpp" +#include "lib/win/UWPCommon.hpp" -#include "boo/graphicsdev/D3D.hpp" +#include "boo/IApplication.hpp" +#include "boo/IGraphicsContext.hpp" +#include "boo/IWindow.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp" +#include "boo/graphicsdev/D3D.hpp" + +#include using namespace Windows::UI; using namespace Windows::UI::Core; diff --git a/lib/win/WindowWin32.cpp b/lib/win/WindowWin32.cpp index a37c5d9..b4edc98 100644 --- a/lib/win/WindowWin32.cpp +++ b/lib/win/WindowWin32.cpp @@ -1,15 +1,16 @@ -#include "Win32Common.hpp" -#include -#include "boo/IApplication.hpp" -#include "boo/IWindow.hpp" -#include "boo/IGraphicsContext.hpp" -#include "logvisor/logvisor.hpp" +#include "lib/win/Win32Common.hpp" +#include + +#include "boo/IApplication.hpp" +#include "boo/IGraphicsContext.hpp" +#include "boo/IWindow.hpp" + +#include "boo/audiodev/IAudioVoiceEngine.hpp" #include "boo/graphicsdev/D3D.hpp" #include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/glew.h" #include "boo/graphicsdev/wglew.h" -#include "boo/audiodev/IAudioVoiceEngine.hpp" #if BOO_HAS_VULKAN #include "boo/graphicsdev/Vulkan.hpp" @@ -19,6 +20,8 @@ #include #endif +#include + static const int ContextAttribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 3, WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB, // WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB, diff --git a/lib/x11/ApplicationUnix.cpp b/lib/x11/ApplicationUnix.cpp index 15ae1fb..c0bec1b 100644 --- a/lib/x11/ApplicationUnix.cpp +++ b/lib/x11/ApplicationUnix.cpp @@ -4,12 +4,15 @@ #define APPLICATION_UNIX_CPP -#include #include -#include -#include "logvisor/logvisor.hpp" +#include + #include "boo/IApplication.hpp" +#include +#include +#include + namespace boo { static logvisor::Module Log("boo::ApplicationUnix"); IApplication* APP = nullptr; diff --git a/lib/x11/ApplicationXlib.hpp b/lib/x11/ApplicationXlib.hpp index f4ff30a..0d97d18 100644 --- a/lib/x11/ApplicationXlib.hpp +++ b/lib/x11/ApplicationXlib.hpp @@ -4,7 +4,7 @@ #include "boo/IApplication.hpp" #include "boo/graphicsdev/GL.hpp" -#include "../Common.hpp" +#include "lib/Common.hpp" #include #include @@ -16,6 +16,7 @@ #include DBusConnection* RegisterDBus(const char* appName, bool& isFirst); +#include #include #include #include diff --git a/lib/x11/WindowWayland.cpp b/lib/x11/WindowWayland.cpp index e64fd67..f404e11 100644 --- a/lib/x11/WindowWayland.cpp +++ b/lib/x11/WindowWayland.cpp @@ -1,4 +1,5 @@ #include "boo/IWindow.hpp" + #include "boo/IGraphicsContext.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp" diff --git a/lib/x11/WindowXlib.cpp b/lib/x11/WindowXlib.cpp index d85ae60..b712267 100644 --- a/lib/x11/WindowXlib.cpp +++ b/lib/x11/WindowXlib.cpp @@ -1,10 +1,11 @@ #include "boo/IWindow.hpp" -#include "boo/IGraphicsContext.hpp" + #include "boo/IApplication.hpp" -#include "boo/graphicsdev/GL.hpp" +#include "boo/IGraphicsContext.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp" +#include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/glew.h" -#include "../Common.hpp" +#include "lib/Common.hpp" #if BOO_HAS_VULKAN #include "boo/graphicsdev/Vulkan.hpp" @@ -35,7 +36,7 @@ #include #include -#include "XlibCommon.hpp" +#include "lib/x11/XlibCommon.hpp" #define REF_DPMM 3.78138 #define FS_ATOM "_NET_WM_STATE_FULLSCREEN" diff --git a/test/main.cpp b/test/main.cpp index 806ccd4..23eafdc 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -1,14 +1,15 @@ -#include -#include #include -#include -#include #include +#include +#include #include -#include -#include +#include + #include -#include "logvisor/logvisor.hpp" +#include +#include + +#include namespace boo {