From: havoc Date: Mon, 9 Aug 2010 17:35:36 +0000 (+0000) Subject: improved include order to fix some compile errors using mingw g++ X-Git-Tag: xonotic-v0.1.0preview~230^2~94 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a892a876d60ec67da321e48e31dc80b95fd6d9aa;p=xonotic%2Fdarkplaces.git improved include order to fix some compile errors using mingw g++ git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10384 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/common.c b/common.c index b94f0973..9bcaeb8c 100644 --- a/common.c +++ b/common.c @@ -19,14 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // common.c -- misc functions used in client and server -#include "quakedef.h" - #include #include #ifndef WIN32 #include #endif +#include "quakedef.h" + cvar_t registered = {0, "registered","0", "indicates if this is running registered quake (whether gfx/pop.lmp was found)"}; cvar_t cmdline = {0, "cmdline","0", "contains commandline the engine was launched with"}; diff --git a/console.c b/console.c index e23de5bb..3ce37373 100644 --- a/console.c +++ b/console.c @@ -19,13 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // console.c -#include "quakedef.h" - #if !defined(WIN32) || defined(__MINGW32__) # include #endif #include +#include "quakedef.h" + // for u8_encodech #include "ft2.h" diff --git a/fs.c b/fs.c index e7a5f536..8086a34b 100644 --- a/fs.c +++ b/fs.c @@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA */ -#include "quakedef.h" - #include #include @@ -37,6 +35,8 @@ # include #endif +#include "quakedef.h" + #include "fs.h" #include "wad.h" diff --git a/snd_win.c b/snd_win.c index a7a2adff..08012248 100644 --- a/snd_win.c +++ b/snd_win.c @@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "quakedef.h" -#include "snd_main.h" #ifdef SUPPORTDIRECTX #ifndef DIRECTSOUND_VERSION @@ -31,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif +#include "qtypes.h" +#include "quakedef.h" +#include "snd_main.h" + // ============================================================================== #ifndef _WAVEFORMATEXTENSIBLE_ diff --git a/sys_win.c b/sys_win.c index 4adaf692..3b48f18d 100644 --- a/sys_win.c +++ b/sys_win.c @@ -19,16 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // sys_win.c -- Win32 system interface code -#include "quakedef.h" #include #include +#include #ifdef SUPPORTDIRECTX #include #endif + +#include "qtypes.h" + +#include "quakedef.h" #include "errno.h" #include "resource.h" #include "conproc.h" -#include "direct.h" HANDLE hinput, houtput;