Merge branch 'master' of github.com:Themaister/SSNES into ssnes-consoles

This commit is contained in:
TwinAphex51224 2011-11-30 18:27:11 +01:00
commit f4aa9fa865
4 changed files with 13 additions and 13 deletions

View File

@ -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"

View File

@ -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__

View File

@ -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"

View File

@ -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>