diff --git a/src/apng.h b/src/apng.h index aa7fac3df..0f22dca6d 100644 --- a/src/apng.h +++ b/src/apng.h @@ -24,12 +24,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define APNG_H #ifndef _MSC_VER -#ifndef _WII #ifndef _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE #endif #endif -#endif #ifndef _LFS64_LARGEFILE #define _LFS64_LARGEFILE diff --git a/src/hardware/s_fmod/s_fmod.c b/src/hardware/s_fmod/s_fmod.c index 9dd1cacbb..5d4422bb1 100644 --- a/src/hardware/s_fmod/s_fmod.c +++ b/src/hardware/s_fmod/s_fmod.c @@ -534,9 +534,6 @@ EXPORT INT32 HWRAPI(Startup) (I_Error_t FatalErrorFunction, snddev_t *snd_dev) case FSOUND_OUTPUT_A3D: DBG_Printf("FMOD driver: A3D driver.\n"); break; - case FSOUND_OUTPUT_XBOX: - DBG_Printf("FMOD driver: Xbox driver\n"); - break; case FSOUND_OUTPUT_OSS: DBG_Printf("FMOD driver: Linux/Unix OSS (Open Sound System) driver, i.e. the kernel sound drivers.\n"); break; @@ -549,12 +546,6 @@ EXPORT INT32 HWRAPI(Startup) (I_Error_t FatalErrorFunction, snddev_t *snd_dev) case FSOUND_OUTPUT_MAC: DBG_Printf("FMOD driver: Mac SoundManager driver\n"); break; - case FSOUND_OUTPUT_PS2: - DBG_Printf("FMOD driver: PlayStation 2 driver\n"); - break; - case FSOUND_OUTPUT_GC: - DBG_Printf("FMOD driver: Gamecube driver\n"); - break; case FSOUND_OUTPUT_NOSOUND_NONREALTIME: DBG_Printf("FMOD driver: This is the same as nosound, but the sound generation is driven by FSOUND_Update\n"); break; diff --git a/src/m_fixed.h b/src/m_fixed.h index 2cb1ddd2e..35287554d 100644 --- a/src/m_fixed.h +++ b/src/m_fixed.h @@ -20,11 +20,6 @@ #include #endif -// Was this just for the #define USEASM? -//#ifdef _WIN32_WCE -//#include "sdl12/SRB2CE/cehelp.h" -//#endif - /*! \brief bits of the fraction */ diff --git a/src/m_misc.c b/src/m_misc.c index 0601bb17d..db41f291a 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -193,7 +193,7 @@ INT32 M_MapNumber(char first, char second) // ========================================================================== // some libcs has no access function, make our own -#if defined (_WIN32_WCE) || defined (_WII) +#if 0 int access(const char *path, int amode) { int accesshandle = -1; diff --git a/src/r_data.c b/src/r_data.c index 4a8ab0a45..48a421170 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -39,11 +39,7 @@ #endif // Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog -#ifdef _WIN32_WCE -#define AVOID_ERRNO -#else #include -#endif // // Texture definition. diff --git a/src/screen.h b/src/screen.h index d379b73ab..64c04dc15 100644 --- a/src/screen.h +++ b/src/screen.h @@ -39,13 +39,8 @@ // we try to re-allocate a minimum of buffers for stability of the memory, // so all the small-enough tables based on screen size, are allocated once // and for all at the maximum size. -#if defined (_WIN32_WCE) -#define MAXVIDWIDTH 320 -#define MAXVIDHEIGHT 200 -#else #define MAXVIDWIDTH 3840 // don't set this too high because actually #define MAXVIDHEIGHT 2160 // lots of tables are allocated with the MAX size. -#endif #define BASEVIDWIDTH 320 // NEVER CHANGE THIS! This is the original #define BASEVIDHEIGHT 200 // resolution of the graphics. diff --git a/src/w_wad.c b/src/w_wad.c index 79af50e21..86bff50a6 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -36,11 +36,7 @@ #define ZWAD #ifdef ZWAD -#ifdef _WIN32_WCE -#define AVOID_ERRNO -#else #include -#endif #include "lzf.h" #endif @@ -145,7 +141,7 @@ static char filenamebuf[MAX_WADPATH]; // This #if is copied from filesrch.c, so not sure if it is 100% suitable for // this -#if defined (_WIN32) && !defined (_XBOX) +#if defined (_WIN32) //#define WIN32_LEAN_AND_MEAN #define RPC_NO_WINDOWS_H #include