jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some build issues on non-windows systems

Browse Source
This commit is contained in:
jp9000
2013-11-26 23:07:27 -07:00
parent 58810f9806
commit e5c99175c5
27 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libobs-d3d11/d3d11-exports.h
View File

@@ -17,7 +17,7 @@
#pragma once
#include "util/c99defs.h"
#include <util/c99defs.h>
extern "C" {

3
libobs-d3d11/d3d11-samplerstate.cpp
View File

@@ -15,8 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include <graphics/vec4.h>
#include "d3d11-subsystem.hpp"
#include "graphics/vec4.h"
static inline D3D11_TEXTURE_ADDRESS_MODE ConvertGSAddressMode(
gs_address_mode mode)

8
libobs-d3d11/d3d11-shader.cpp
View File

@@ -17,10 +17,10 @@
#include "d3d11-subsystem.hpp"
#include "d3d11-shaderprocessor.hpp"
#include "graphics/vec2.h"
#include "graphics/vec3.h"
#include "graphics/matrix3.h"
#include "graphics/matrix4.h"
#include <graphics/vec2.h>
#include <graphics/vec3.h>
#include <graphics/matrix3.h>
#include <graphics/matrix4.h>
void gs_vertex_shader::GetBuffersExpected(
const vector<D3D11_INPUT_ELEMENT_DESC> &inputs)

2
libobs-d3d11/d3d11-shaderprocessor.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "graphics/shader-parser.h"
#include <graphics/shader-parser.h>
struct ShaderParser : shader_parser {
inline ShaderParser() {shader_parser_init(this);}

6
libobs-d3d11/d3d11-subsystem.cpp
View File

@@ -15,9 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "util/base.h"
#include "util/platform.h"
#include "graphics/matrix3.h"
#include <util/base.h>
#include <util/platform.h>
#include <graphics/matrix3.h>
#include "d3d11-subsystem.hpp"
static const IID dxgiFactory2 =

12
libobs-d3d11/d3d11-subsystem.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "util/AlignedNew.hpp"
#include <util/AlignedNew.hpp>
#include <vector>
#include <string>
@@ -27,11 +27,11 @@
#include <d3d11.h>
#include <d3dcompiler.h>
#include "util/base.h"
#include "graphics/matrix4.h"
#include "graphics/graphics.h"
#include "util/windows/ComPtr.hpp"
#include "util/windows/HRError.hpp"
#include <util/base.h>
#include <graphics/matrix4.h>
#include <graphics/graphics.h>
#include <util/windows/ComPtr.hpp>
#include <util/windows/HRError.hpp>
struct shader_var;
struct shader_sampler;

2
libobs-d3d11/d3d11-texture2d.cpp
View File

@@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "util/base.h"
#include <util/base.h>
#include "d3d11-subsystem.hpp"
void gs_texture_2d::InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd,

4
libobs-d3d11/d3d11-vertexbuffer.cpp
View File

@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "util/base.h"
#include "graphics/vec3.h"
#include <util/base.h>
#include <graphics/vec3.h>
#include "d3d11-subsystem.hpp"
static inline void PushBuffer(vector<ID3D11Buffer*> &buffers,