Move ExitGame into GameLoop.h.

stepmania/PBProject/SMMain.mm

@@ -1,8 +1,8 @@
 #import <Cocoa/Cocoa.h>
 #include "ProductInfo.h"
+#include "GameLoop.h"
 
 // XXX remove these
-extern void ExitGame();
 extern "C"
 {
 	extern int SDL_main(int, char **);

stepmania/src/GameLoop.h

@@ -3,6 +3,7 @@
 #ifndef GAME_LOOP_H
 #define GAME_LOOP_H
 
+void ExitGame();
 void GameLoop();
 void StartConcurrentRendering();
 void FinishConcurrentRendering();

stepmania/src/ScreenExit.cpp

@@ -5,7 +5,7 @@
 #include "GameSoundManager.h"
 #include "RageSound.h"
 #include "RageLog.h"
-#include "StepMania.h"
+#include "GameLoop.h"
 
 /* This screen used to wait for sounds to stop.  However, implementing GetPlayingSounds()
  * is annoying, because sounds might be deleted at any time; they aren't ours to have

stepmania/src/StepMania.h

@@ -11,7 +11,6 @@ int main( int argc, char* argv[] );
 #endif
 void ApplyGraphicOptions();
 void NORETURN HandleException( CString error );
-void ExitGame();
 void ResetGame();
 void ChangeCurrentGame( const Game* g );
 void FocusChanged( bool bHasFocus );

stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp

@@ -3,6 +3,7 @@
 #include "RageThreads.h"
 #include "ArchHooks_Unix.h"
 #include "StepMania.h"
+#include "GameLoop.h"
 #include "archutils/Unix/SignalHandler.h"
 #include "archutils/Unix/GetSysInfo.h"
 #include "archutils/Unix/LinuxThreadHelpers.h"

stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp

@@ -8,6 +8,7 @@
 #include "archutils/Unix/CrashHandler.h"
 #include "archutils/Unix/SignalHandler.h"
 #include "StepMania.h"
+#include "GameLoop.h"
 #define Random Random_ // work around namespace pollution
 #include <Carbon/Carbon.h>
 #undef Random_

stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp

@@ -4,6 +4,7 @@
 #include "RageLog.h"
 #include "RageDisplay.h" // for REFRESH_DEFAULT
 #include "StepMania.h"
+#include "GameLoop.h"
 
 #if defined(UNIX)
 #include <X11/Xlib.h>