From 419afbcb83b4c554b2f65b941d358016f0ed35a5 Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Wed, 30 Nov 2011 17:27:47 +0100 Subject: [PATCH] Progresses to thread.c now --- Makefile.ps3 | 4 ++-- gfx/gfx_common.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index 7ff15bb106..59d0204420 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -39,11 +39,11 @@ INCDIRS = -I. -Icommon MKFSELF_NPDRM = $(CELL_SDK)/$(HOST_DIR)/bin/make_fself_npdrm MKPKG_NPDRM = $(CELL_SDK)/$(HOST_DIR)/bin/make_package_npdrm -OBJ = ps3/buffer.o ps3/ps3_audio.o ps3/resampler.o ps3/ps3_input.o getopt.o ssnes.o driver.o settings.o dynamic.o message.o rewind.o movie.o autosave.o gfx/gfx_common.o gfx/gl.c gfx/shader_cg.c gfx/snes_state.c ups.o bps.o strl.o screenshot.o thread.o audio/hermite.o +OBJ = ps3/buffer.o ps3/ps3_audio.o ps3/resampler.o ps3/ps3_input.o getopt.o ssnes.o driver.o settings.o message.o rewind.o movie.o autosave.o gfx/gfx_common.o gfx/gl.c gfx/shader_cg.c gfx/snes_state.c ups.o bps.o strl.o screenshot.o thread.o audio/hermite.o LIBS = -ldbgfont -lPSGL -lgcm_cmd -lgcm_sys_stub -lresc_stub libsnes.a -lm -lio_stub -lfs_stub -lsysutil_stub -lsysmodule_stub -laudio_stub -lnet_stub -lpthread -DEFINES = -DHAVE_DYNAMIC=1 -DHAVE_DYLIB=1 -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__ -DPACKAGE_VERSION=\".0.9.2\" +DEFINES = -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__ -DPACKAGE_VERSION=\".0.9.2\" # Wrap it up, son! #LIBS += -Wl,-wrap,fopen -Wl,-wrap,fclose -Wl,-wrap,fwrite -Wl,-wrap,fread -Wl,-wrap,fseek -Wl,-wrap,ftell -Wl,-wrap,fflush -Wl,-wrap,rewind -Wl,-wrap,fgetpos -Wl,-wrap,fsetpos -Wl,-wrap,setbuf -Wl,-wrap,setvbuf -Wl,-wrap,ungetc -Wl,-wrap,feof diff --git a/gfx/gfx_common.c b/gfx/gfx_common.c index 2f2ee6d517..99571d75f6 100644 --- a/gfx/gfx_common.c +++ b/gfx/gfx_common.c @@ -16,7 +16,7 @@ */ #include "gfx_common.h" -#include "general.h" +#include "../general.h" #include static float tv_to_fps(const struct timeval *tv, const struct timeval *new_tv, int frames)