diff --git a/src/emucore/FSNode.cxx b/src/emucore/FSNode.cxx index 3c71ad874..244add8bd 100644 --- a/src/emucore/FSNode.cxx +++ b/src/emucore/FSNode.cxx @@ -18,7 +18,6 @@ // Copyright (C) 2002-2004 The ScummVM project //============================================================================ -#include "bspf.hxx" #include "FSNodeFactory.hxx" #include "FSNode.hxx" diff --git a/src/emucore/FSNode.hxx b/src/emucore/FSNode.hxx index f53fc3dc4..c880cd4d8 100644 --- a/src/emucore/FSNode.hxx +++ b/src/emucore/FSNode.hxx @@ -21,7 +21,7 @@ #ifndef FS_NODE_HXX #define FS_NODE_HXX -#include +#include "bspf.hxx" /* * The API described in this header is meant to allow for file system browsing in a diff --git a/src/libretro/SDL/SDL.h b/src/libretro/SDL/SDL.h deleted file mode 100644 index f10994a99..000000000 --- a/src/libretro/SDL/SDL.h +++ /dev/null @@ -1,49 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2019 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#ifndef SDL_H -#define SDL_H - -#include "bspf.hxx" - -typedef struct SDL_version -{ - uInt8 major; /**< major version */ - uInt8 minor; /**< minor version */ - uInt8 patch; /**< update version */ -} SDL_version; - -typedef enum -{ - SDL_SCANCODE_UNKNOWN = 0 -} SDL_Scancode; - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static inline void SDL_GetVersion(SDL_version* ver) -{ - ver->major = 2; - ver->minor = 0; - ver->patch = 9; -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static inline void SDL_Quit(void) {} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static inline const char* SDL_GetScancodeName(SDL_Scancode scancode) { return ""; } - -#endif diff --git a/src/libretro/SoundLIBRETRO.hxx b/src/libretro/SoundLIBRETRO.hxx index 0a410eecf..51b1fbbeb 100644 --- a/src/libretro/SoundLIBRETRO.hxx +++ b/src/libretro/SoundLIBRETRO.hxx @@ -25,8 +25,6 @@ class AudioQueue; class EmulationTiming; class AudioSettings; -#include "SDL_lib.hxx" - #include "bspf.hxx" #include "Sound.hxx" #include "AudioQueue.hxx" @@ -111,7 +109,7 @@ class SoundLIBRETRO : public Sound public: /** Empties the playback buffer. - + @param stream Output audio buffer @param samples Number of audio samples read */ diff --git a/src/libretro/Stella.vcxproj b/src/libretro/Stella.vcxproj index 009ced9de..2659cb33e 100644 --- a/src/libretro/Stella.vcxproj +++ b/src/libretro/Stella.vcxproj @@ -512,8 +512,9 @@ + - + \ No newline at end of file diff --git a/src/libretro/zlib/zlib.h b/src/libretro/zlib/zlib.h deleted file mode 100644 index c776ee0dd..000000000 --- a/src/libretro/zlib/zlib.h +++ /dev/null @@ -1,111 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2019 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#ifndef ZLIB_H -#define ZLIB_H - -#include "bspf.hxx" - - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 -#define Z_BLOCK 5 -#define Z_TREES 6 - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_RLE 3 -#define Z_FIXED 4 -#define Z_DEFAULT_STRATEGY 0 - -#define Z_BINARY 0 -#define Z_TEXT 1 -#define Z_ASCII Z_TEXT -#define Z_UNKNOWN 2 - -#define Z_DEFLATED 8 - -#define Z_NULL 0 - -#define MAX_WBITS 16 - - -#define Bytef uInt8 - - -typedef struct z_stream_s { - uInt8* next_in; - uInt32 avail_in; - uInt32 total_in; - - uInt8* next_out; - uInt32 avail_out; - uInt32 total_out; - - char* msg; - - void* zalloc; - void* zfree; - void* opaque; - - int data_type; - uInt32 adler; - uInt32 reserved; -} z_stream; - -typedef z_stream *z_streamp; - -struct gzFile_s { - unsigned have; - unsigned char *next; - uInt64 pos; -}; - -typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */ - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static inline int inflateInit2(z_streamp, int) { return Z_ERRNO; } -static inline bool readStream(z_streamp, int, int, int) { return false; } - -static inline int inflate(z_streamp, int) { return Z_ERRNO; } -static inline int inflateEnd(z_streamp) { return Z_ERRNO; } - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static inline gzFile gzopen(const char*, const char*) { return nullptr; } -static inline int gzread(gzFile, void*, unsigned) { return Z_ERRNO; } -static inline int gzclose(gzFile) { return Z_ERRNO; } - -#endif /* ZLIB_H */ diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj index 7e09df81d..49f4672bf 100644 --- a/src/windows/Stella.vcxproj +++ b/src/windows/Stella.vcxproj @@ -157,7 +157,7 @@ Disabled ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) - BSPF_WINDOWS;WIN32;DEBUG_BUILD;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDLL @@ -193,7 +193,7 @@ Disabled ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) - BSPF_WINDOWS;WIN32;DEBUG_BUILD;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDLL @@ -226,7 +226,7 @@ true false ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) - BSPF_WINDOWS;WIN32;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -260,7 +260,7 @@ true false ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) - BSPF_WINDOWS;WIN32;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -298,7 +298,7 @@ AnySuitable true ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) - BSPF_WINDOWS;WIN32;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -335,7 +335,7 @@ Default true ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) - BSPF_WINDOWS;WIN32;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -1399,4 +1399,4 @@ - + \ No newline at end of file