From: Marc Cannon Date: Sat, 19 Jan 2013 15:16:04 +0000 (-0500) Subject: Re-add headers that Windows complains about not having for one reason or another X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=46e9abef33a6e7d66f2656b014a7032806893375;p=openitg.git Re-add headers that Windows complains about not having for one reason or another --- diff --git a/src/ActorFrame.cpp b/src/ActorFrame.cpp index 2d5e5c2b..47375370 100644 --- a/src/ActorFrame.cpp +++ b/src/ActorFrame.cpp @@ -6,6 +6,10 @@ #include "RageDisplay.h" #include "ScreenDimensions.h" +#if defined(DEBUG) +#include "arch/Dialog/Dialog.h" +#endif + // lua start LUA_REGISTER_CLASS( ActorFrame ) // lua end diff --git a/src/AnnouncerManager.cpp b/src/AnnouncerManager.cpp index 3d257e03..067c27a2 100644 --- a/src/AnnouncerManager.cpp +++ b/src/AnnouncerManager.cpp @@ -1,7 +1,8 @@ #include "global.h" -#include "AnnouncerManager.h" +#include "RageFile.h" #include "RageLog.h" #include "RageUtil.h" +#include "AnnouncerManager.h" AnnouncerManager* ANNOUNCER = NULL; // global object accessable from anywhere in the program diff --git a/src/LinkedOptionsMenu.cpp b/src/LinkedOptionsMenu.cpp index 6263e075..8afde337 100644 --- a/src/LinkedOptionsMenu.cpp +++ b/src/LinkedOptionsMenu.cpp @@ -1,8 +1,9 @@ -#include "LinkedOptionsMenu.h" -#include "ActorUtil.h" +#include "global.h" #include "ScreenManager.h" +#include "ActorUtil.h" +#include "LinkedOptionsMenu.h" -#ifdef MSVC +#ifdef _MSC_VER /* It's going to be a pain to fix these. Disable for now. */ #pragma warning( disable : 4018 ) // signed/unsigned mismatch #pragma warning( disable : 4244 ) // conversion, possible loss of data diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp index 580acbcc..d1a9a56a 100644 --- a/src/RageDisplay.cpp +++ b/src/RageDisplay.cpp @@ -1,3 +1,4 @@ +#include "global.h" #include "RageDisplay.h" #include "RageLog.h" #include "RageMath.h" diff --git a/src/ScreenSetTime.cpp b/src/ScreenSetTime.cpp index edaef301..5a34c459 100644 --- a/src/ScreenSetTime.cpp +++ b/src/ScreenSetTime.cpp @@ -5,6 +5,7 @@ #include "GameState.h" #include "GameSoundManager.h" #include "arch/ArchHooks/ArchHooks.h" +#include static const CString SetTimeSelectionNames[] = { "Year", diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 99c47c76..5f85c8eb 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -1,5 +1,4 @@ #include "global.h" - #include "StepMania.h" // @@ -71,6 +70,7 @@ #if defined(WIN32) && !defined(XBOX) #include +#include "archutils/Win32/VideoDriverInfo.h" #endif #if defined(UNIX) diff --git a/src/UserPackManager.cpp b/src/UserPackManager.cpp index 95e82349..a0817ffe 100644 --- a/src/UserPackManager.cpp +++ b/src/UserPackManager.cpp @@ -1,3 +1,4 @@ +#include "global.h" #include "UserPackManager.h" #include "RageUtil.h" #include "RageLog.h" diff --git a/src/ezsockets.cpp b/src/ezsockets.cpp index eafc5154..b3ce9958 100644 --- a/src/ezsockets.cpp +++ b/src/ezsockets.cpp @@ -6,6 +6,7 @@ | UDP/NON-TCP Support by Adam Lowman. | \*******************************************************************/ +#include "global.h" #include "ezsockets.h" #if defined(_XBOX) diff --git a/src/timer/Timer.cpp b/src/timer/Timer.cpp index f1b32a1e..bc1b6989 100644 --- a/src/timer/Timer.cpp +++ b/src/timer/Timer.cpp @@ -1,3 +1,4 @@ +#include "global.h" #include "Timer.h" ProfilingTimer::ProfilingTimer() {