diff options
| author | aliaspider | 2014-11-26 22:17:53 +0100 |
|---|---|---|
| committer | aliaspider | 2014-11-26 22:17:53 +0100 |
| commit | 238cf4a72fc162adbef4e48f75698ed54ed99369 (patch) | |
| tree | 5fb5b7d232e2cce4b6c87727b1cf63b70398b7e6 | |
| parent | 1f844f5295cbfa6f628f1b0b97c8e04e925ceff9 (diff) | |
| download | snes9x2005-238cf4a72fc162adbef4e48f75698ed54ed99369.tar.gz snes9x2005-238cf4a72fc162adbef4e48f75698ed54ed99369.tar.bz2 snes9x2005-238cf4a72fc162adbef4e48f75698ed54ed99369.zip | |
(windows) build fix
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | source/snes9x.h | 19 |
2 files changed, 3 insertions, 22 deletions
@@ -1,8 +1,8 @@ DEBUG = 0 -PERF_TEST = 1 -HAVE_GRIFFIN = 1 +PERF_TEST = 0 +HAVE_GRIFFIN = 0 LOAD_FROM_MEMORY_TEST = 0 -USE_BLARGG_APU = 0 +USE_BLARGG_APU = 1 ifeq ($(platform),) platform = unix diff --git a/source/snes9x.h b/source/snes9x.h index 4bf7409..e8bc7ba 100644 --- a/source/snes9x.h +++ b/source/snes9x.h @@ -99,30 +99,12 @@ extern int cprintf(const char* fmt, ...); -#ifdef __WIN32__ -#include "..\wsnes9x.h" -#include "..\zlib\zlib.h" -#endif - #include "port.h" #include "65c816.h" #include "messages.h" #define ROM_NAME_LEN 23 -#ifdef ZLIB -#ifndef __WIN32__ -#include "zlib.h" -#endif -#define STREAM gzFile -#define READ_STREAM(p,l,s) gzread (s,p,l) -#define WRITE_STREAM(p,l,s) gzwrite (s,p,l) -#define OPEN_STREAM(f,m) gzopen (f,m) -#define REOPEN_STREAM(f,m) gzdopen (f,m) -#define FIND_STREAM(f) gztell(f) -#define REVERT_STREAM(f,o,s) gzseek(f,o,s) -#define CLOSE_STREAM(s) gzclose (s) -#else #define STREAM FILE* #define READ_STREAM(p,l,s) fread (p,1,l,s) #define WRITE_STREAM(p,l,s) fwrite (p,1,l,s) @@ -131,7 +113,6 @@ extern int cprintf(const char* fmt, ...); #define FIND_STREAM(f) ftell(f) #define REVERT_STREAM(f,o,s) fseek(f,o,s) #define CLOSE_STREAM(s) fclose (s) -#endif /* SNES screen width and height */ |