AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable more code; remove <Windows.h> from headers

This commit is contained in:
Luke Street 2022-02-22 00:47:36 -05:00
parent e458d1999c
commit 94d11cb328
4 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
CMakeLists.txt
View File

@ -95,17 +95,17 @@ add_library(boo
lib/Common.hpp lib/Common.hpp
# lib/graphicsdev/Common.cpp # lib/graphicsdev/Common.cpp
# lib/graphicsdev/Common.hpp # lib/graphicsdev/Common.hpp
lib/inputdev/DeviceBase.cpp include/boo/inputdev/DeviceBase.hpp # lib/inputdev/DeviceBase.cpp include/boo/inputdev/DeviceBase.hpp
lib/inputdev/CafeProPad.cpp include/boo/inputdev/CafeProPad.hpp # lib/inputdev/CafeProPad.cpp include/boo/inputdev/CafeProPad.hpp
lib/inputdev/RevolutionPad.cpp include/boo/inputdev/RevolutionPad.hpp # lib/inputdev/RevolutionPad.cpp include/boo/inputdev/RevolutionPad.hpp
lib/inputdev/DolphinSmashAdapter.cpp include/boo/inputdev/DolphinSmashAdapter.hpp # lib/inputdev/DolphinSmashAdapter.cpp include/boo/inputdev/DolphinSmashAdapter.hpp
lib/inputdev/NintendoPowerA.cpp include/boo/inputdev/NintendoPowerA.hpp # lib/inputdev/NintendoPowerA.cpp include/boo/inputdev/NintendoPowerA.hpp
lib/inputdev/DualshockPad.cpp include/boo/inputdev/DualshockPad.hpp # lib/inputdev/DualshockPad.cpp include/boo/inputdev/DualshockPad.hpp
lib/inputdev/GenericPad.cpp include/boo/inputdev/GenericPad.hpp # lib/inputdev/GenericPad.cpp include/boo/inputdev/GenericPad.hpp
lib/inputdev/DeviceSignature.cpp include/boo/inputdev/DeviceSignature.hpp # lib/inputdev/DeviceSignature.cpp include/boo/inputdev/DeviceSignature.hpp
lib/inputdev/DeviceFinder.cpp include/boo/inputdev/DeviceFinder.hpp # lib/inputdev/DeviceFinder.cpp include/boo/inputdev/DeviceFinder.hpp
lib/inputdev/HIDParser.cpp include/boo/inputdev/HIDParser.hpp # lib/inputdev/HIDParser.cpp include/boo/inputdev/HIDParser.hpp
lib/inputdev/IHIDDevice.hpp # lib/inputdev/IHIDDevice.hpp
# include/boo/IGraphicsContext.hpp # include/boo/IGraphicsContext.hpp
include/boo/audiodev/IAudioSubmix.hpp include/boo/audiodev/IAudioSubmix.hpp
include/boo/audiodev/IAudioVoice.hpp include/boo/audiodev/IAudioVoice.hpp
@ -116,8 +116,8 @@ add_library(boo
include/boo/audiodev/MIDIEncoder.hpp include/boo/audiodev/MIDIEncoder.hpp
# include/boo/graphicsdev/IGraphicsDataFactory.hpp # include/boo/graphicsdev/IGraphicsDataFactory.hpp
# include/boo/graphicsdev/IGraphicsCommandQueue.hpp # include/boo/graphicsdev/IGraphicsCommandQueue.hpp
include/boo/inputdev/IHIDListener.hpp # include/boo/inputdev/IHIDListener.hpp
include/boo/inputdev/XInputPad.hpp # include/boo/inputdev/XInputPad.hpp
include/boo/boo.hpp include/boo/boo.hpp
include/boo/BooObject.hpp include/boo/BooObject.hpp
include/boo/DeferredWindowEvents.hpp include/boo/DeferredWindowEvents.hpp
@ -125,7 +125,7 @@ add_library(boo
include/boo/IWindow.hpp include/boo/IWindow.hpp
include/boo/System.hpp include/boo/System.hpp
include/boo/ThreadLocalPtr.hpp include/boo/ThreadLocalPtr.hpp
InputDeviceClasses.cpp # InputDeviceClasses.cpp
) )
if (NOT MSVC) if (NOT MSVC)
@ -189,8 +189,8 @@ if(WINDOWS_STORE)
target_sources(boo PRIVATE target_sources(boo PRIVATE
${AudioMatrix_SRC} ${AudioMatrix_SRC}
lib/audiodev/WASAPI.cpp lib/audiodev/WASAPI.cpp
lib/inputdev/HIDDeviceUWP.cpp # lib/inputdev/HIDDeviceUWP.cpp
lib/inputdev/HIDListenerUWP.cpp # lib/inputdev/HIDListenerUWP.cpp
# lib/graphicsdev/D3D11.cpp # lib/graphicsdev/D3D11.cpp
# lib/graphicsdev/D3D12.cpp # lib/graphicsdev/D3D12.cpp
# lib/win/ApplicationUWP.cpp # lib/win/ApplicationUWP.cpp
@ -252,12 +252,12 @@ elseif(WIN32)
${AudioMatrix_SRC} ${AudioMatrix_SRC}
lib/audiodev/WASAPI.cpp lib/audiodev/WASAPI.cpp
# lib/graphicsdev/D3D11.cpp # lib/graphicsdev/D3D11.cpp
lib/inputdev/HIDListenerWinUSB.cpp # lib/inputdev/HIDListenerWinUSB.cpp
lib/inputdev/HIDDeviceWinUSB.cpp # lib/inputdev/HIDDeviceWinUSB.cpp
lib/win/ApplicationWin32.cpp # lib/win/ApplicationWin32.cpp
lib/win/WindowWin32.cpp # lib/win/WindowWin32.cpp
lib/win/WinCommon.hpp # lib/win/WinCommon.hpp
lib/win/Win32Common.hpp # lib/win/Win32Common.hpp
# include/boo/graphicsdev/D3D.hpp # include/boo/graphicsdev/D3D.hpp
) )
@ -280,15 +280,15 @@ elseif(APPLE)
target_sources(boo PRIVATE target_sources(boo PRIVATE
lib/audiodev/AQS.cpp lib/audiodev/AQS.cpp
${AudioMatrix_SRC} ${AudioMatrix_SRC}
lib/inputdev/HIDListenerIOKit.cpp # lib/inputdev/HIDListenerIOKit.cpp
lib/inputdev/HIDDeviceIOKit.cpp # lib/inputdev/HIDDeviceIOKit.cpp
# lib/mac/ApplicationCocoa.mm # lib/mac/ApplicationCocoa.mm
# lib/mac/WindowCocoa.mm # lib/mac/WindowCocoa.mm
# lib/mac/CocoaCommon.hpp # lib/mac/CocoaCommon.hpp
# lib/graphicsdev/Metal.mm # lib/graphicsdev/Metal.mm
lib/CFPointer.hpp lib/CFPointer.hpp
lib/inputdev/IOKitPointer.hpp # lib/inputdev/IOKitPointer.hpp
# include/boo/graphicsdev/Metal.hpp # include/boo/graphicsdev/Metal.hpp
) )
@ -437,8 +437,8 @@ else(NOT GEKKO)
# endif() # endif()
target_sources(boo PRIVATE target_sources(boo PRIVATE
${AudioMatrix_SRC} ${AudioMatrix_SRC}
lib/inputdev/HIDDeviceUdev.cpp # lib/inputdev/HIDDeviceUdev.cpp
lib/inputdev/HIDListenerUdev.cpp # lib/inputdev/HIDListenerUdev.cpp
) )
target_link_libraries(boo target_link_libraries(boo
PUBLIC PUBLIC
@ -450,8 +450,8 @@ else(NOT GEKKO)
else() else()
target_sources(boo PRIVATE target_sources(boo PRIVATE
${AudioMatrix_SRC} ${AudioMatrix_SRC}
lib/inputdev/HIDDeviceBSD.cpp # lib/inputdev/HIDDeviceBSD.cpp
lib/inputdev/HIDListenerBSD.cpp # lib/inputdev/HIDListenerBSD.cpp
) )
target_link_libraries(boo target_link_libraries(boo
PUBLIC PUBLIC

10
include/boo/System.hpp
View File

@ -7,16 +7,6 @@
#else #else
#define WINDOWS_STORE 0 #define WINDOWS_STORE 0
#endif #endif
#include <windows.h>
#include <D3Dcommon.h>
#include <wrl/client.h>
template <class T>
using ComPtr = Microsoft::WRL::ComPtr<T>;
template <class T>
static inline ComPtr<T>* ReferenceComPtr(ComPtr<T>& ptr) {
return reinterpret_cast<ComPtr<T>*>(ptr.GetAddressOf());
}
#endif #endif
#include <string> #include <string>

13
lib/audiodev/WASAPI.cpp
View File

@ -1,10 +1,7 @@
#include "lib/win/Win32Common.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include <iterator> #include <iterator>
#include "boo/IApplication.hpp"
#include "lib/audiodev/AudioVoiceEngine.hpp"
#include <Mmdeviceapi.h> #include <Mmdeviceapi.h>
#include <Audioclient.h> #include <Audioclient.h>
#include <mmsystem.h> #include <mmsystem.h>
@ -38,6 +35,14 @@ using namespace Windows::Media::Devices;
const IID IID_IAudioClient = __uuidof(IAudioClient); const IID IID_IAudioClient = __uuidof(IAudioClient);
const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient); const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
#include <wrl/client.h>
template <class T>
using ComPtr = Microsoft::WRL::ComPtr<T>;
template <class T>
static inline ComPtr<T>* ReferenceComPtr(ComPtr<T>& ptr) {
return reinterpret_cast<ComPtr<T>*>(ptr.GetAddressOf());
}
namespace boo { namespace boo {
static logvisor::Module Log("boo::WASAPI"); static logvisor::Module Log("boo::WASAPI");

2
lib/win/Win32Common.hpp
View File

@ -12,7 +12,9 @@
#if BOO_HAS_VULKAN #if BOO_HAS_VULKAN
#include "boo/graphicsdev/Vulkan.hpp" #include "boo/graphicsdev/Vulkan.hpp"
#endif #endif
#if BOO_HAS_GL
#include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/GL.hpp"
#endif
#include <condition_variable> #include <condition_variable>
#include <mutex> #include <mutex>