s/_DEBUG/DEBUG/

stepmania/src/AnnouncerManager.cpp

@@ -72,7 +72,7 @@ CString AnnouncerManager::GetPathTo( CString sFolderName )
 	CString sPathToFolderCurrent = GetAnnouncerDirFromName(m_sCurAnnouncerName) + sFolderName;
 	CString sPathToFolderEmpty = GetAnnouncerDirFromName(EMPTY_ANNOUNCER_NAME) + sFolderName;
 
-#ifdef _DEBUG
+#ifdef DEBUG
 	if( m_sCurAnnouncerName!=""  &&  !DoesFileExist(sPathToFolderCurrent) )
 	{
 		LOG->Trace( "The current announcer is missing the folder '%s'.", sFolderName.GetString() );

stepmania/src/MusicBannerWheel.cpp

@@ -87,7 +87,7 @@ MusicBannerWheel::MusicBannerWheel()
 
 	LoadSongData();
 
-	#ifdef _DEBUG
+	#ifdef DEBUG
 	m_debugtext.LoadFromFont( THEME->GetPathTo("Fonts","small titles") );
 	m_debugtext.SetXY( 0, -120 );
 	this->AddChild(&m_debugtext);
@@ -312,7 +312,7 @@ void MusicBannerWheel::BannersLeft()
 	//	m_ScrollingList.Unload();
 	// LoadSongData();
 	InsertNewBanner(GOINGLEFT);
-	#ifdef _DEBUG
+	#ifdef DEBUG
 		m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
 	#endif
 	m_ScrollingList.Left();
@@ -336,7 +336,7 @@ void MusicBannerWheel::BannersRight()
 	//	m_ScrollingList.Unload();
 	//	LoadSongData();
 	InsertNewBanner(GOINGRIGHT);
-	#ifdef _DEBUG
+	#ifdef DEBUG
 		m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
 	#endif
 	m_ScrollingList.Right();

stepmania/src/MusicBannerWheel.h

@@ -40,7 +40,7 @@ private:
 	void ChangeNotes();
 	void InsertNewBanner(int direction);
 
-	#ifdef _DEBUG
+	#ifdef DEBUG
 		BitmapText	m_debugtext;
 	#endif
 

stepmania/src/PrefsManager.cpp

@@ -30,7 +30,7 @@ const float DEFAULT_SOUND_VOLUME = 0.50;
 
 PrefsManager::PrefsManager()
 {
-#ifdef _DEBUG
+#ifdef DEBUG
 	m_bWindowed = true;
 #else
 	m_bWindowed = false;
@@ -43,7 +43,7 @@ PrefsManager::PrefsManager()
 	m_iRefreshRate = REFRESH_DEFAULT;
 	m_bIgnoreJoyAxes = false;		// when did this get changed to ON by default?
 	m_bOnlyDedicatedMenuButtons = false;
-#ifdef _DEBUG
+#ifdef DEBUG
 	m_bShowStats = true;
 #else
 	m_bShowStats = false;

stepmania/src/RageMovieTexture.cpp

@@ -15,7 +15,7 @@
 #pragma comment(lib, "winmm.lib") 
  
 // Link with the DirectShow base class libraries
-#if defined(DEBUG) | defined(_DEBUG)
+#if defined(DEBUG)
 	#pragma comment(lib, "baseclasses/debug/strmbasd.lib") 
 #else
 	#pragma comment(lib, "baseclasses/release/strmbase.lib") 

stepmania/src/SDL_utils.cpp

@@ -16,7 +16,7 @@
 #if defined(WIN32)
 
 /* Pull in all of our SDL libraries here. */
-#ifdef _DEBUG
+#ifdef DEBUG
 #pragma comment(lib, "SDL-1.2.5/lib/SDLd.lib")
 #pragma comment(lib, "SDL_image-1.2/SDL_imaged.lib")
 #else

stepmania/src/ScreenEz2SelectMusic.cpp

@@ -101,7 +101,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
 		m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
 		this->AddChild( &m_ChoiceListHighlight );
 
-		#ifdef _DEBUG
+		#ifdef DEBUG
 		m_debugtext.LoadFromFont( THEME->GetPathTo("Fonts","small titles") );
 		m_debugtext.SetXY( CENTER_X, CENTER_Y );
 		this->AddChild(&m_debugtext);
@@ -224,7 +224,7 @@ void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound)
 {
 	sOptions = GAMESTATE->m_PlayerOptions[pn].GetString();
 
-	#ifdef _DEBUG
+	#ifdef DEBUG
 		m_debugtext.SetText( "DEBUG: " + sOptions );
 	#endif
 

stepmania/src/ScreenEz2SelectMusic.h

@@ -77,7 +77,7 @@ protected:
 
 	int i_ErrorDetected;
 
-	#ifdef _DEBUG
+	#ifdef DEBUG
 		BitmapText	m_debugtext;
 	#endif
 

stepmania/src/StepMania.cpp

@@ -229,7 +229,7 @@ int main(int argc, char* argv[])
 	/* Set this up second.  Do this early, since it's needed for RageException::Throw. 
 	 * Do it after ChangeToDirOfExecutable, so the log ends up in the right place. */
 	LOG			= new RageLog();
-#ifdef _DEBUG
+#ifdef DEBUG
 	LOG->ShowConsole();
 #endif
 
@@ -249,7 +249,7 @@ int main(int argc, char* argv[])
 
 	CString  g_sErrorString = "";
 
-#ifndef _DEBUG
+#ifndef DEBUG
 	try{
 #endif
 
@@ -339,7 +339,7 @@ int main(int argc, char* argv[])
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	PREFSMAN->SaveGamePrefsToDisk();
 
-#ifndef _DEBUG
+#ifndef DEBUG
 	}
 	catch( RageException e )
 	{

stepmania/src/ThemeManager.cpp

@@ -147,7 +147,7 @@ try_element_again:
 						"Verify that this redirect is correct.",
 						asPossibleElementFilePaths[0].GetString(), sNewFilePath.GetString());
 
-#ifdef _DEBUG
+#ifdef DEBUG
 			if( MessageBox(NULL, message.GetString(), "ThemeManager", MB_RETRYCANCEL ) == IDRETRY)
 				goto try_element_again;
 #endif
@@ -216,7 +216,7 @@ CString ThemeManager::GetPathToOptional( CString sAssetCategory, CString sFileNa
 
 CString ThemeManager::GetPathTo( CString sAssetCategory, CString sFileName ) 
 {
-#ifdef _DEBUG
+#ifdef DEBUG
 try_element_again:
 #endif
 
@@ -224,7 +224,7 @@ try_element_again:
 	if( !ret.empty() )	// we found something
 		return ret;
 
-#ifdef _DEBUG
+#ifdef DEBUG
 	CString sMessage = ssprintf("The theme element %s/%s is missing.",sAssetCategory.GetString(),sFileName.GetString());
 	switch( MessageBox(NULL, sMessage, "ThemeManager", MB_RETRYCANCEL ) )
 	{
@@ -262,7 +262,7 @@ CString ThemeManager::GetMetricsPathFromName( CString sThemeName )
 
 CString ThemeManager::GetMetric( CString sClassName, CString sValueName )
 {
-#ifdef _DEBUG
+#ifdef DEBUG
 try_metric_again:
 #endif
 	CString sCurMetricPath = GetMetricsPathFromName(m_sCurThemeName);
@@ -292,7 +292,7 @@ try_metric_again:
 		return sValue;
 	}
 
-#ifdef _DEBUG
+#ifdef DEBUG
 	if( IDRETRY == MessageBox(NULL,ssprintf("The theme metric %s-%s is missing.  Correct this and click Retry, or Cancel to break.",sClassName.GetString(),sValueName.GetString()),"ThemeManager",MB_RETRYCANCEL ) )
 		goto try_metric_again;
 #endif