mirror of
https://github.com/CTCaer/RetroArch.git
synced 2025-01-04 17:18:39 +00:00
Merge branch 'master' of github.com:Themaister/SSNES into ssnes-consoles
This commit is contained in:
commit
f4aa9fa865
8
gfx/gl.c
8
gfx/gl.c
@ -16,14 +16,14 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "driver.h"
|
||||
#include "../driver.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include "libsnes.hpp"
|
||||
#include "../libsnes.hpp"
|
||||
#include <stdio.h>
|
||||
#include <sys/time.h>
|
||||
#include <string.h>
|
||||
#include "general.h"
|
||||
#include "../general.h"
|
||||
#include <assert.h>
|
||||
#include <math.h>
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#include "gl_common.h"
|
||||
#include "gfx_common.h"
|
||||
#include "sdlwrap.h"
|
||||
#include "strl.h"
|
||||
#include "../strl.h"
|
||||
|
||||
#define NO_SDL_GLEXT
|
||||
#include "SDL.h"
|
||||
|
@ -18,11 +18,11 @@
|
||||
#ifndef __GL_COMMON_H
|
||||
#define __GL_COMMON_H
|
||||
|
||||
#include "general.h"
|
||||
#include "../general.h"
|
||||
#include <assert.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include "../config.h"
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
|
@ -18,12 +18,12 @@
|
||||
#include "shader_cg.h"
|
||||
#include <Cg/cg.h>
|
||||
#include <Cg/cgGL.h>
|
||||
#include "general.h"
|
||||
#include "../general.h"
|
||||
#include <string.h>
|
||||
#include "strl.h"
|
||||
#include "conf/config_file.h"
|
||||
#include "../strl.h"
|
||||
#include "../conf/config_file.h"
|
||||
#include "image.h"
|
||||
#include "dynamic.h"
|
||||
#include "../dynamic.h"
|
||||
|
||||
#ifdef HAVE_CONFIGFILE
|
||||
#include "snes_state.h"
|
||||
|
@ -17,11 +17,11 @@
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "general.h"
|
||||
#include "../general.h"
|
||||
#include "shader_glsl.h"
|
||||
#include "strl.h"
|
||||
#include "../strl.h"
|
||||
#include "snes_state.h"
|
||||
#include "dynamic.h"
|
||||
#include "../dynamic.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
|
Loading…
Reference in New Issue
Block a user