fixed some build issues on non-windows systems
parent
58810f9806
commit
e5c99175c5
|
@ -1,4 +1,3 @@
|
|||
if !OS_WIN
|
||||
obs_plugin_datadir = $(datadir)/obs-plugins
|
||||
obs_plugin_data_testdir = $(obs_plugin_datadir)/test-input
|
||||
data_libobsdir = $(datadir)/libobs
|
||||
|
@ -10,4 +9,3 @@ data_libobs_DATA = libobs/default.effect
|
|||
#uninstall-local:
|
||||
# rm -r $(DESTDIR)$(obs_plugin_datadir)
|
||||
# rm -r $(DESTDIR)$(data_libobsdir)
|
||||
endif
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "util/c99defs.h"
|
||||
#include <util/c99defs.h>
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);}
|
||||
|
|
|
@ -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 =
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "util/c99defs.h"
|
||||
#include <util/c99defs.h>
|
||||
|
||||
EXPORT device_t device_create(struct gs_init_data *data);
|
||||
EXPORT void device_destroy(device_t device);
|
||||
|
|
|
@ -16,11 +16,12 @@
|
|||
******************************************************************************/
|
||||
|
||||
#include <assert.h>
|
||||
#include "graphics/vec2.h"
|
||||
#include "graphics/vec3.h"
|
||||
#include "graphics/vec4.h"
|
||||
#include "graphics/matrix3.h"
|
||||
#include "graphics/matrix4.h"
|
||||
|
||||
#include <graphics/vec2.h>
|
||||
#include <graphics/vec3.h>
|
||||
#include <graphics/vec4.h>
|
||||
#include <graphics/matrix3.h>
|
||||
#include <graphics/matrix4.h>
|
||||
#include "gl-subsystem.h"
|
||||
#include "gl-shaderparser.h"
|
||||
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
* Takes the parsed shader data, and builds a GLSL string out of it.
|
||||
*/
|
||||
|
||||
#include "util/dstr.h"
|
||||
#include "graphics/shader-parser.h"
|
||||
#include <util/dstr.h>
|
||||
#include <graphics/shader-parser.h>
|
||||
|
||||
struct gl_parser_attrib {
|
||||
struct dstr name;
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
******************************************************************************/
|
||||
|
||||
#include "graphics/matrix3.h"
|
||||
#include <graphics/matrix3.h>
|
||||
#include "gl-subsystem.h"
|
||||
|
||||
static void clear_textures(struct gs_device *device)
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "util/darray.h"
|
||||
#include "graphics/graphics.h"
|
||||
#include "graphics/matrix4.h"
|
||||
#include <util/darray.h>
|
||||
#include <graphics/graphics.h>
|
||||
#include <graphics/matrix4.h>
|
||||
#ifdef GLEW_STATIC
|
||||
#include "glew/include/GL/glew.h"
|
||||
#else
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
******************************************************************************/
|
||||
|
||||
#include "graphics/vec3.h"
|
||||
#include <graphics/vec3.h>
|
||||
#include "gl-subsystem.h"
|
||||
|
||||
static bool create_buffers(struct gs_vertex_buffer *vb)
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
|
||||
#include "util/darray.h"
|
||||
#include <util/darray.h>
|
||||
#include "gl-subsystem.h"
|
||||
#include "glew/include/GL/wglew.h"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
INCLUDES = -iquote$(top_srcdir)/libobs -isystem./glew/include
|
||||
INCLUDES = -isystem$(top_srcdir)/libobs -isystem./glew/include
|
||||
AM_CFLAGS = -DGLEW_NO_GLU -DGLEW_STATIC
|
||||
|
||||
if OS_WIN
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
ACLOCAL_AMFLAGS = -I m4
|
||||
EXTRA_DIST = autogen.sh COPYING README
|
||||
SUBDIRS = libobs libobs-opengl test build obs
|
||||
SUBDIRS = libobs libobs-opengl test obs
|
||||
|
||||
if OS_WIN
|
||||
SUBDIRS += build
|
||||
endif
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
INCLUDES = -I$(top_srcdir)/libobs
|
||||
|
||||
if OS_WIN
|
||||
if ARCH_X86_64
|
||||
obsdir = ../build/bin/64bit
|
||||
|
@ -9,7 +11,7 @@ obsdir = $(bindir)
|
|||
endif
|
||||
|
||||
obs_PROGRAMS = obs
|
||||
# obs_LDADD = $(top_srcdir)/libobs/libobs.la
|
||||
obs_LDADD = $(top_srcdir)/libobs/libobs.la
|
||||
obs_SOURCES = window-obs-basic.cpp \
|
||||
window-subclass.cpp \
|
||||
obs-app.cpp \
|
||||
|
|
|
@ -38,11 +38,13 @@ static void do_log(enum log_type type, const char *msg, va_list args)
|
|||
char bla[4096];
|
||||
vsnprintf(bla, 4095, msg, args);
|
||||
|
||||
#ifdef _WIN32
|
||||
OutputDebugStringA(bla);
|
||||
OutputDebugStringA("\n");
|
||||
|
||||
if (type >= LOG_WARNING)
|
||||
__debugbreak();
|
||||
#endif
|
||||
}
|
||||
|
||||
void OBSApp::InitGlobalConfigDefaults()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
INCLUDES = -iquote$(top_srcdir)/libobs
|
||||
INCLUDES = -isystem$(top_srcdir)/libobs
|
||||
|
||||
if OS_WIN
|
||||
if ARCH_X86
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "obs.h"
|
||||
#include <obs.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "util/c99defs.h"
|
||||
#include <util/c99defs.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "obs.h"
|
||||
#include <obs.h>
|
||||
#include "test-input-exports.h"
|
||||
|
||||
const char *inputs[] = {"random"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "obs.h"
|
||||
#include <obs.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
INCLUDES = -iquote$(top_srcdir)/libobs
|
||||
INCLUDES = -isystem$(top_srcdir)/libobs
|
||||
AM_CPPFLAGS = -DUNICODE -D_UNICODE
|
||||
|
||||
builddir = ../../build
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#include <time.h>
|
||||
#include <windows.h>
|
||||
|
||||
#include "util/base.h"
|
||||
#include "media-io/audio-resampler.h"
|
||||
#include "obs.h"
|
||||
#include <util/base.h>
|
||||
#include <media-io/audio-resampler.h>
|
||||
#include <obs.h>
|
||||
|
||||
#include <intrin.h>
|
||||
|
||||
|
|
Loading…
Reference in New Issue