From 8f3d7bb7498218801cecdf4024c30988e0770352 Mon Sep 17 00:00:00 2001 From: divverent Date: Sat, 5 Mar 2011 14:59:14 +0000 Subject: [PATCH] instead, define the FILE_OFFSET_BITS part in the build environment, and remove it from quakedef.h as it is not reliable there git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10894 d7cf8633-e32d-0410-b094-e92efae38249 --- darkplaces-dedicated.dev | 2 +- darkplaces-dedicated.dsp | 8 ++++---- darkplaces-dedicated.vcproj | 8 ++++---- darkplaces-sdl.dev | 2 +- darkplaces-sdl.dsp | 8 ++++---- darkplaces-sdl.vcproj | 8 ++++---- darkplaces-wgl.vcproj | 8 ++++---- darkplaces.dev | 2 +- darkplaces.dsp | 8 ++++---- fs.c | 18 +++++++----------- makefile.inc | 2 +- quakedef.h | 6 ------ 12 files changed, 35 insertions(+), 45 deletions(-) diff --git a/darkplaces-dedicated.dev b/darkplaces-dedicated.dev index 4a6341ee..c6391082 100644 --- a/darkplaces-dedicated.dev +++ b/darkplaces-dedicated.dev @@ -10,7 +10,7 @@ Libs= PrivateResource=darkplaces-dedicated_private.rc ResourceIncludes= MakeIncludes= -Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops_@@_ +Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES_@@_ CppCompiler= Linker=-lwinmm -lws2_32_@@_ IsCpp=0 diff --git a/darkplaces-dedicated.dsp b/darkplaces-dedicated.dsp index 55e126c4..09e5d6a6 100644 --- a/darkplaces-dedicated.dsp +++ b/darkplaces-dedicated.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release-Dedicated" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "NDEBUG" @@ -69,8 +69,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug-Dedicated" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "_DEBUG" diff --git a/darkplaces-dedicated.vcproj b/darkplaces-dedicated.vcproj index 25b90131..e4ed29fd 100755 --- a/darkplaces-dedicated.vcproj +++ b/darkplaces-dedicated.vcproj @@ -44,7 +44,7 @@ -# include -# include -#endif - -// on *x, we MUST include "quakedef.h" before anything that may include IO -// functions to get _FILE_OFFSET_BITS -#include "quakedef.h" - #ifdef __APPLE__ // include SDL for IPHONEOS code # include @@ -43,12 +33,18 @@ #include #include -#ifndef WIN32 +#ifdef WIN32 +# include +# include +# include +#else # include # include # include #endif +#include "quakedef.h" + #include "fs.h" #include "wad.h" diff --git a/makefile.inc b/makefile.inc index 8fb3813e..c81dcaa1 100644 --- a/makefile.inc +++ b/makefile.inc @@ -187,7 +187,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_SND_COMMON) snd_sdl. # Compilation -CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) +CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES CFLAGS_DEBUG=-ggdb CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs CFLAGS_RELEASE= diff --git a/quakedef.h b/quakedef.h index f378a9ee..12a953e4 100644 --- a/quakedef.h +++ b/quakedef.h @@ -22,12 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef QUAKEDEF_H #define QUAKEDEF_H -/// on UNIX platforms we need to define this so that video saving does not cause a SIGFSZ (file size) signal when a video clip exceeds 2GB -#define _FILE_OFFSET_BITS 64 - -// for cd_linux.c -#define __KERNEL_STRICT_NAMES - #if defined(__GNUC__) && (__GNUC__ > 2) #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1))) #define DP_FUNC_PURE __attribute__ ((pure)) -- 2.39.2