fixed some build issues on non-windows systems
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user