From 52d35e0e50657aa25d77cee63aa0e89773e717a8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 16 Feb 2003 04:20:40 +0000 Subject: [PATCH] ... and remove them --- stepmania/src/StdAfx.cpp | 14 ----- stepmania/src/StdAfx.h | 128 --------------------------------------- 2 files changed, 142 deletions(-) delete mode 100644 stepmania/src/StdAfx.cpp delete mode 100644 stepmania/src/StdAfx.h diff --git a/stepmania/src/StdAfx.cpp b/stepmania/src/StdAfx.cpp deleted file mode 100644 index e45b9deb6b..0000000000 --- a/stepmania/src/StdAfx.cpp +++ /dev/null @@ -1,14 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: stdafx.cpp - - Desc: Basic.pch will be the pre-compiled header - stdafx.obj will contain the pre-compiled type information. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. ------------------------------------------------------------------------------ -*/ - - -#include "stdafx.h" - diff --git a/stepmania/src/StdAfx.h b/stepmania/src/StdAfx.h deleted file mode 100644 index d8455fbe60..0000000000 --- a/stepmania/src/StdAfx.h +++ /dev/null @@ -1,128 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: stdafx.h - - Desc: Include file for standard system include files. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - -#ifndef STDAFX_H -#define STDAFX_H - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff - -#if defined(_MSC_VER) && (_MSC_VER > 1100) -#pragma warning (disable : 4786) // turn off broken debugger warning -#pragma warning (disable : 4512) // assignment operator could not be generated (so?) -/* "unreferenced formal parameter"; we *want* that in many cases */ -#pragma warning (disable : 4100) -/* "case 'aaa' is not a valid value for switch of enum 'bbb' - * Actually, this is a valid warning, but we do it all over the - * place, eg. with ScreenMessages. Those should be fixed, but later. XXX */ -#pragma warning (disable : 4063) -#pragma warning (disable : 4127) -#pragma warning (disable : 4786) /* VC6: identifier was truncated to '255' characters in the debug information */ -#endif - -#undef min -#undef max -#define NOMINMAX /* make sure Windows doesn't try to define this */ - - - -/* Make sure everyone has min and max: */ -#include - -/* Everything will need string for one reason or another: */ -#include - -/* And vector: */ -#include - -using namespace std; - -#ifdef ASSERT -#undef ASSERT -#endif - -#if defined(WIN32) -/* Assertion that sets an optional message and brings up the crash handler, so - * we get a backtrace. This should probably be used instead of throwing an - * exception in most cases we expect never to happen (but not in cases that - * we do expect, such as DSound init failure.) */ -#include "archutils/win32/crash.h" -#define RAGE_ASSERT_M(COND, MESSAGE) { if(!(COND)) { VDCHECKPOINT_M(MESSAGE); *(char*)0=0; } } -#define RAGE_ASSERT(COND) RAGE_ASSERT_M((COND), "Assertion '" #COND "' failed") - -/* Make this the default assert handler. */ -#define ASSERT RAGE_ASSERT -#else -#include -/* TODO: define RAGE_ASSERT* (nothing actually uses those right now) */ -#define ASSERT assert -#define RAGE_ASSERT_M(COND, MESSAGE) ASSERT(COND) -#define RAGE_ASSERT(COND) RAGE_ASSERT_M((COND), "Assertion '" #COND "' failed") -#endif - -/* Define a macro to tell the compiler that a function doesn't return. This just - * improves compiler warnings. This should be placed near the beginning of the - * function prototype (although it looks better near the end, VC only accepts it - * at the beginning). */ -#if defined(_MSC_VER) -#define NORETURN __declspec(noreturn) -#elif defined(__GNUC__) && defined(__attribute__) -#define NORETURN __attribute__ ((__noreturn__)) -#else -#define NORETURN -#endif - -/* Use CStdString: */ -#include "StdString.h" -#define CString CStdString - -#if defined(_MSC_VER) && _MSC_VER < 1300 /* VC6, not VC7 */ - -/* VC6's is doesn't actually define min and max. */ -template -inline const T& max(const T &a, const T &b) -{ return a < b? b:a; } -template -inline const T& max(const T &a, const T &b, P Pr) -{ return Pr(a, b)? b:a; } -template -inline const T& min(const T &a, const T &b) -{ return b < a? b:a; } -template -inline const T& min(const T &a, const T &b, P Pr) -{ return Pr(b, a)? b:a; } - -#endif - -#define CStringArray vector - -/* Include this here to make sure our assertion handler is always - * used. (This file is a dependency of most everything anyway, - * so there's no real problem putting it here.) */ -#include "RageException.h" - -/* Platform-specific fixes. */ -#if defined(WIN32) -#include "archutils/Win32/arch_setup.h" -#endif - -#if !defined(WIN32) -#define stricmp strcasecmp -#define strnicmp strncasecmp -#endif - -/* Don't include our own headers here, since they tend to change - * often. */ - -#endif