From ec19f44f965e20d08e9438d9f1d8d31fe60947eb Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 23 Apr 2018 17:53:27 +0200 Subject: [PATCH] project: Don't prefix includes with "libobs/" --- source/filter-blur.cpp | 6 +++--- source/filter-custom-shader.cpp | 6 +++--- source/filter-displacement.h | 4 ++-- source/filter-shape.cpp | 6 +++--- source/filter-transform.cpp | 6 +++--- source/gfx-effect-source.cpp | 2 +- source/gfx-effect-source.h | 2 +- source/gfx-source-texture.h | 2 +- source/gs-effect.cpp | 2 +- source/gs-effect.h | 10 +++++----- source/gs-helper.h | 2 +- source/gs-indexbuffer.cpp | 2 +- source/gs-indexbuffer.h | 2 +- source/gs-rendertarget.cpp | 2 +- source/gs-rendertarget.h | 2 +- source/gs-sampler.h | 2 +- source/gs-texture.cpp | 4 ++-- source/gs-texture.h | 2 +- source/gs-vertex.h | 2 +- source/gs-vertexbuffer.cpp | 2 +- source/gs-vertexbuffer.h | 2 +- source/plugin.h | 4 ++-- source/util-math.h | 6 +++--- 23 files changed, 40 insertions(+), 40 deletions(-) diff --git a/source/filter-blur.cpp b/source/filter-blur.cpp index b46ff8bc..1161050a 100644 --- a/source/filter-blur.cpp +++ b/source/filter-blur.cpp @@ -26,9 +26,9 @@ extern "C" { #pragma warning (push) #pragma warning (disable: 4201) -#include "libobs/util/platform.h" -#include "libobs/graphics/graphics.h" -#include "libobs/graphics/matrix4.h" +#include "util/platform.h" +#include "graphics/graphics.h" +#include "graphics/matrix4.h" #pragma warning (pop) } diff --git a/source/filter-custom-shader.cpp b/source/filter-custom-shader.cpp index 562d00b5..fc1812d5 100644 --- a/source/filter-custom-shader.cpp +++ b/source/filter-custom-shader.cpp @@ -26,9 +26,9 @@ extern "C" { #pragma warning (push) #pragma warning (disable: 4201) -#include "libobs/util/platform.h" -#include "libobs/graphics/graphics.h" -#include "libobs/graphics/matrix4.h" +#include "util/platform.h" +#include "graphics/graphics.h" +#include "graphics/matrix4.h" #pragma warning (pop) } diff --git a/source/filter-displacement.h b/source/filter-displacement.h index 211f7b65..f758a57e 100644 --- a/source/filter-displacement.h +++ b/source/filter-displacement.h @@ -23,8 +23,8 @@ extern "C" { #pragma warning (push) #pragma warning (disable: 4201) -#include -#include +#include +#include #pragma warning (pop) } diff --git a/source/filter-shape.cpp b/source/filter-shape.cpp index 678d29b1..110566fa 100644 --- a/source/filter-shape.cpp +++ b/source/filter-shape.cpp @@ -27,9 +27,9 @@ extern "C" { #pragma warning (push) #pragma warning (disable: 4201) -#include "libobs/util/platform.h" -#include "libobs/graphics/graphics.h" -#include "libobs/graphics/matrix4.h" +#include "util/platform.h" +#include "graphics/graphics.h" +#include "graphics/matrix4.h" #pragma warning (pop) } diff --git a/source/filter-transform.cpp b/source/filter-transform.cpp index d7f4b126..130da6bb 100644 --- a/source/filter-transform.cpp +++ b/source/filter-transform.cpp @@ -24,9 +24,9 @@ extern "C" { #pragma warning (push) #pragma warning (disable: 4201) - #include "libobs/util/platform.h" - #include "libobs/graphics/graphics.h" - #include "libobs/graphics/matrix4.h" + #include "util/platform.h" + #include "graphics/graphics.h" + #include "graphics/matrix4.h" #pragma warning (pop) } diff --git a/source/gfx-effect-source.cpp b/source/gfx-effect-source.cpp index 1fb99012..7eafeede 100644 --- a/source/gfx-effect-source.cpp +++ b/source/gfx-effect-source.cpp @@ -17,7 +17,7 @@ #include "gfx-effect-source.h" #include "strings.h" -#include +#include #include bool gfx::effect_source::property_type_modified(void*, obs_properties_t* props, obs_property_t*, obs_data_t* sett) { diff --git a/source/gfx-effect-source.h b/source/gfx-effect-source.h index 67af9a37..2ad61fa9 100644 --- a/source/gfx-effect-source.h +++ b/source/gfx-effect-source.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include "gs-effect.h" #include "gs-rendertarget.h" diff --git a/source/gfx-source-texture.h b/source/gfx-source-texture.h index abcf3e52..2511500c 100644 --- a/source/gfx-source-texture.h +++ b/source/gfx-source-texture.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include "gs-texture.h" #include "gs-rendertarget.h" diff --git a/source/gs-effect.cpp b/source/gs-effect.cpp index cabeb78a..18723c5e 100644 --- a/source/gs-effect.cpp +++ b/source/gs-effect.cpp @@ -22,7 +22,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-effect.h b/source/gs-effect.h index 852fbaab..1e41d110 100644 --- a/source/gs-effect.h +++ b/source/gs-effect.h @@ -27,11 +27,11 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include #pragma warning( pop ) } diff --git a/source/gs-helper.h b/source/gs-helper.h index d12d4538..f0fae1d6 100644 --- a/source/gs-helper.h +++ b/source/gs-helper.h @@ -23,7 +23,7 @@ extern "C" { #pragma warning (push) #pragma warning (disable: 4201) - #include "libobs/graphics/graphics.h" + #include "graphics/graphics.h" #pragma warning (pop) } diff --git a/source/gs-indexbuffer.cpp b/source/gs-indexbuffer.cpp index 2de3693e..ebe156d1 100644 --- a/source/gs-indexbuffer.cpp +++ b/source/gs-indexbuffer.cpp @@ -22,7 +22,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-indexbuffer.h b/source/gs-indexbuffer.h index 0df885ff..db780580 100644 --- a/source/gs-indexbuffer.h +++ b/source/gs-indexbuffer.h @@ -23,7 +23,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-rendertarget.cpp b/source/gs-rendertarget.cpp index c1c29b07..c630887f 100644 --- a/source/gs-rendertarget.cpp +++ b/source/gs-rendertarget.cpp @@ -22,7 +22,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-rendertarget.h b/source/gs-rendertarget.h index e4e5d575..33e75410 100644 --- a/source/gs-rendertarget.h +++ b/source/gs-rendertarget.h @@ -24,7 +24,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-sampler.h b/source/gs-sampler.h index 2350d9f6..b9f288ea 100644 --- a/source/gs-sampler.h +++ b/source/gs-sampler.h @@ -22,7 +22,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-texture.cpp b/source/gs-texture.cpp index 4dc2e26e..a757991c 100644 --- a/source/gs-texture.cpp +++ b/source/gs-texture.cpp @@ -24,8 +24,8 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include - #include + #include + #include #pragma warning( pop ) } diff --git a/source/gs-texture.h b/source/gs-texture.h index 84ea4961..d73853aa 100644 --- a/source/gs-texture.h +++ b/source/gs-texture.h @@ -23,7 +23,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) -#include +#include #pragma warning( pop ) } diff --git a/source/gs-vertex.h b/source/gs-vertex.h index c86eb06b..463e8c7c 100644 --- a/source/gs-vertex.h +++ b/source/gs-vertex.h @@ -24,7 +24,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) - #include + #include #pragma warning( pop ) } diff --git a/source/gs-vertexbuffer.cpp b/source/gs-vertexbuffer.cpp index 98a30011..5b49e9f7 100644 --- a/source/gs-vertexbuffer.cpp +++ b/source/gs-vertexbuffer.cpp @@ -23,7 +23,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) -#include +#include #pragma warning( pop ) } diff --git a/source/gs-vertexbuffer.h b/source/gs-vertexbuffer.h index e58d005b..88118d89 100644 --- a/source/gs-vertexbuffer.h +++ b/source/gs-vertexbuffer.h @@ -26,7 +26,7 @@ extern "C" { #pragma warning( push ) #pragma warning( disable: 4201 ) -#include +#include #pragma warning( pop ) } diff --git a/source/plugin.h b/source/plugin.h index 60b885f4..a6810462 100644 --- a/source/plugin.h +++ b/source/plugin.h @@ -24,8 +24,8 @@ #pragma warning (push) #pragma warning (disable: 4201) -#include "libobs/obs-module.h" -#include "libobs/util/platform.h" +#include "obs-module.h" +#include "util/platform.h" #pragma warning (pop) // Plugin diff --git a/source/util-math.h b/source/util-math.h index 53f9b145..d8709948 100644 --- a/source/util-math.h +++ b/source/util-math.h @@ -24,9 +24,9 @@ #include // OBS -#include -#include -#include +#include +#include +#include // Constants #define PI 3.1415926535897932384626433832795