quakedef: Add darkplaces.h and include it in as many files as I can. Split up and...

A client and server agnostic master definitions file is nice to have and
this may speed up compile times and make refactoring easier later on.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12972 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/com_crc16.c b/com_crc16.c
index f6c7df554ce6577cd8537d63d8979ac31d4a6695..1b3a965249ba04a8741ee6742d8c9a8c00048c5b 100644 (file)
--- a/com_crc16.c
+++ b/com_crc16.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // com_crc16.c
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
 /*
 ============================================================================

diff --git a/darkplaces-sdl2-vs2017.vcxproj b/darkplaces-sdl2-vs2017.vcxproj
index 0186e20cd86ea8b0ebc9f9ec3d2eb6727b9e2f51..e53d2bf41e8e87e70dd74e814cac421e88e0cfef 100644 (file)
--- a/darkplaces-sdl2-vs2017.vcxproj
+++ b/darkplaces-sdl2-vs2017.vcxproj
@@ -338,6 +338,7 @@
     <ClInclude Include="csprogs.h" />\r
     <ClInclude Include="curves.h" />\r
     <ClInclude Include="cvar.h" />\r
+    <ClInclude Include="darkplaces.h" />\r
     <ClInclude Include="dpvsimpledecode.h" />\r
     <ClInclude Include="draw.h" />\r
     <ClInclude Include="fs.h" />\r

diff --git a/darkplaces-sdl2-vs2019.vcxproj b/darkplaces-sdl2-vs2019.vcxproj
index 3f254cb19c658e5b257f96ba806982d8d5ef25ca..8b4658a74a634b6559b3299d83fbbdd7ff0eb132 100644 (file)
--- a/darkplaces-sdl2-vs2019.vcxproj
+++ b/darkplaces-sdl2-vs2019.vcxproj
@@ -339,6 +339,7 @@
     <ClInclude Include="csprogs.h" />\r
     <ClInclude Include="curves.h" />\r
     <ClInclude Include="cvar.h" />\r
+    <ClInclude Include="darkplaces.h" />\r
     <ClInclude Include="dpvsimpledecode.h" />\r
     <ClInclude Include="draw.h" />\r
     <ClInclude Include="fs.h" />\r

diff --git a/darkplaces.h b/darkplaces.h
new file mode 100644 (file)
index 0000000..b025e2a
--- /dev/null
+++ b/darkplaces.h
@@ -0,0 +1,69 @@
+/*
+Copyright (C) 1996-1997 Id Software, Inc.
+Copyright (C) 2020 Ashley Rose Hale (LadyHavoc)
+Copyright (C) 2020 David Knapp (Cloudwalk)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+/* darkplaces.h - Master definitions file for Darkplaces engine */
+
+#ifndef DARKPLACES_H
+#define DARKPLACES_H
+
+extern const char *buildstring;
+extern char engineversion[128];
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+#endif
+
+#include <sys/types.h>
+#include <ctype.h>
+#include <math.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include "sys.h"
+#include "qtypes.h"
+#include "qdefs.h"
+#include "zone.h"
+#include "thread.h"
+#include "com_list.h"
+#include "common.h"
+#include "fs.h"
+#include "host.h"
+#include "cvar.h"
+#include "cmd.h"
+#include "console.h"
+#include "lhnet.h"
+#include "mathlib.h"
+#include "matrixlib.h"
+
+extern cvar_t developer;
+extern cvar_t developer_entityparsing;
+extern cvar_t developer_extra;
+extern cvar_t developer_insane;
+extern cvar_t developer_loadfile;
+extern cvar_t developer_loading;
+extern cvar_t host_isclient;
+extern cvar_t sessionid;
+
+#endif

diff --git a/filematch.c b/filematch.c
index 47aeb35e21ae2be1720d5aa936e833cec4a6c62a..e06439614c2174927168128adf5b1fcbe8fa268d 100644 (file)
--- a/filematch.c
+++ b/filematch.c
@@ -5,7 +5,7 @@
 #include <dirent.h>
 #endif
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
 // LadyHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
 

diff --git a/hmac.c b/hmac.c
index 83f062b969939f385a61f6d93972e949bcd3b70a..8b6d2f6234caa8e612d2710e35daaacc16bd40bb 100644 (file)
--- a/hmac.c
+++ b/hmac.c
@@ -1,4 +1,4 @@
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "hmac.h"
 
 qbool hmac(

diff --git a/image_png.c b/image_png.c
index 600f787b808fb91ccd227347e9bcb65e4efac854..5562cedaf7f275194db882857224c611971c5329 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -26,7 +26,7 @@
 //
 //LadyHavoc: rewrote most of this.
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "image.h"
 #include "image_png.h"
 

diff --git a/jpeg.c b/jpeg.c
index 0a6e160a2bedd3b14597af69e42dcf1b3490855e..8d6ceec2376cb21fa50d5257e18b31266b8023b0 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -22,7 +22,8 @@
 */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
+#include "cl_screen.h"
 #include "image.h"
 #include "jpeg.h"
 #include "image_png.h"

diff --git a/lhnet.c b/lhnet.c
index 71b9cef5d5e26cca3ed7e1a4260c42b0be2e24a5..d043f81cf7cb9e69d3e1610a9ef6fcce6829567a 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -17,7 +17,7 @@
 #endif
 
 #ifndef STANDALONETEST
-#include "quakedef.h"
+#include "darkplaces.h"
 #endif
 
 #include <stdlib.h>

diff --git a/matrixlib.c b/matrixlib.c
index 733fca9db956e7dd6393c8050868a751049b65d3..dd6f3c6a348919f14b7620cf2a0ac1daea2e352e 100644 (file)
--- a/matrixlib.c
+++ b/matrixlib.c
@@ -1,7 +1,5 @@
-#include "quakedef.h"
-
+#include "darkplaces.h"
 #include <math.h>
-#include "matrixlib.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4244)     // LadyHavoc: MSVC++ 4 x86, double/float

diff --git a/mdfour.c b/mdfour.c
index bfee0212acae3e88ab5216f3248e1b8f09c6bfbf..46c3abf82e70c031b0c923f151f1d9750a3fddb7 100644 (file)
--- a/mdfour.c
+++ b/mdfour.c
@@ -27,9 +27,8 @@
        $Id$
 */
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
-#include <string.h>            /* XoXus: needed for memset call */
 #include "mdfour.h"
 
 /* NOTE: This code makes no attempt to be fast!

diff --git a/model_shared.h b/model_shared.h
index c72715c9c4272a341328a500e6d64a5d9fc09fbf..ec5720ea4f069d3efcf16b193d7b9e99067fb70a 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MODEL_SHARED_H
 #define MODEL_SHARED_H
 
+#include "bspfile.h"
+
 typedef enum synctype_e {ST_SYNC=0, ST_RAND } synctype_t;
 
 /*

diff --git a/qdefs.h b/qdefs.h
index ce1d38209ec21d28190f294d6353c9cd6094db7a..1996d86fbcb6bad629ede75c4b4e9674c4f6a01d 100644 (file)
--- a/qdefs.h
+++ b/qdefs.h
@@ -169,4 +169,33 @@
 
 #define        NET_MINRATE             1000 ///< limits "rate" and "sv_maxrate" cvars
 
+// In Quake, any char in 0..32 counts as whitespace
+//#define ISWHITESPACE(ch) ((unsigned char) ch <= (unsigned char) ' ')
+#define ISWHITESPACE(ch) (!(ch) || (ch) == ' ' || (ch) == '\t' || (ch) == '\r' || (ch) == '\n')
+#define ISCOMMENT(ch, pos) ch[pos] == '/' && ch[pos + 1] == '/' && (pos == 0 || ISWHITESPACE(ch[pos - 1]))
+// This also includes extended characters, and ALL control chars
+#define ISWHITESPACEORCONTROL(ch) ((signed char) (ch) <= (signed char) ' ')
+
+#ifdef PRVM_64
+#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000
+#define FLOAT_LOSSLESS_FORMAT "%.17g"
+#define VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g"
+#else
+#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFF) // also match "negative zero" floats of value 0x80000000
+#define FLOAT_LOSSLESS_FORMAT "%.9g"
+#define VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
+#endif
+
+// originally this was _MSC_VER
+// but here we want to test the system libc, which on win32 is borked, and NOT the compiler
+#ifdef WIN32
+#define INT_LOSSLESS_FORMAT_SIZE "I64"
+#define INT_LOSSLESS_FORMAT_CONVERT_S(x) ((__int64)(x))
+#define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((unsigned __int64)(x))
+#else
+#define INT_LOSSLESS_FORMAT_SIZE "j"
+#define INT_LOSSLESS_FORMAT_CONVERT_S(x) ((intmax_t)(x))
+#define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((uintmax_t)(x))
+#endif
+
 #endif

diff --git a/quakedef.h b/quakedef.h
index f1b59313f280ce0d53ae54edf93a7f069e2c354b..ec5c72b6efb29fbb305e5d0f0ed17bb542fd3a24 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,28 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef QUAKEDEF_H
 #define QUAKEDEF_H
 
-#ifdef __APPLE__
-# include <TargetConditionals.h>
-#endif
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <math.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#include "qtypes.h"
-
-extern const char *buildstring;
-extern char engineversion[128];
+#include "darkplaces.h"
 
 #define GAMENAME "id1"
-
-#include "qdefs.h"
-#include "qstats.h"
+#define STARTCONFIGFILENAME "quake.rc"
+#define CONFIGFILENAME "config.cfg"
 
 // moveflags values
 #define MOVEFLAG_VALID 0x80000000
@@ -139,16 +122,7 @@ extern char engineversion[128];
 
 //===========================================
 
-#include "zone.h"
-#include "thread.h"
-#include "fs.h"
-#include "common.h"
-#include "com_list.h"
-#include "cvar.h"
-#include "bspfile.h"
-#include "sys.h"
 #include "vid.h"
-#include "mathlib.h"
 
 #include "r_textures.h"
 
@@ -157,8 +131,6 @@ extern char engineversion[128];
 #include "screen.h"
 #include "netconn.h"
 #include "protocol.h"
-#include "cmd.h"
-#include "host.h"
 #include "sbar.h"
 #include "sound.h"
 #include "model_shared.h"
@@ -171,140 +143,14 @@ extern char engineversion[128];
 
 #include "input.h"
 #include "keys.h"
-#include "console.h"
 #ifdef CONFIG_MENU
 #include "menu.h"
 #endif
 #include "csprogs.h"
-
-extern qbool noclip_anglehack;
-
-extern cvar_t developer;
-extern cvar_t developer_entityparsing;
-extern cvar_t developer_extra;
-extern cvar_t developer_insane;
-extern cvar_t developer_loadfile;
-extern cvar_t developer_loading;
-
-extern cvar_t sessionid;
-
-#define STARTCONFIGFILENAME "quake.rc"
-#define CONFIGFILENAME "config.cfg"
-
-/* Preprocessor macros to identify platform
-    DP_OS_NAME         - "friendly" name of the OS, for humans to read
-    DP_OS_STR  - "identifier" of the OS, more suited for code to use
-    DP_ARCH_STR        - "identifier" of the processor architecture
- */
-#if defined(__ANDROID__) /* must come first because it also defines linux */
-# define DP_OS_NAME            "Android"
-# define DP_OS_STR             "android"
-# define USE_GLES2             1
-# define USE_RWOPS             1
-# define LINK_TO_ZLIB  1
-# define LINK_TO_LIBVORBIS 1
-#ifdef USEXMP
-# define LINK_TO_LIBXMP 1 // nyov: if someone can test with the android NDK compiled libxmp?
-#endif
-# define DP_MOBILETOUCH        1
-# define DP_FREETYPE_STATIC 1
-#elif TARGET_OS_IPHONE /* must come first because it also defines MACOSX */
-# define DP_OS_NAME            "iPhoneOS"
-# define DP_OS_STR             "iphoneos"
-# define USE_GLES2             1
-# define LINK_TO_ZLIB  1
-# define LINK_TO_LIBVORBIS 1
-# define DP_MOBILETOUCH        1
-# define DP_FREETYPE_STATIC 1
-#elif defined(__linux__)
-# define DP_OS_NAME            "Linux"
-# define DP_OS_STR             "linux"
-#elif defined(_WIN64)
-# define DP_OS_NAME            "Windows64"
-# define DP_OS_STR             "win64"
-#elif defined(WIN32)
-# define DP_OS_NAME            "Windows"
-# define DP_OS_STR             "win32"
-#elif defined(__FreeBSD__)
-# define DP_OS_NAME            "FreeBSD"
-# define DP_OS_STR             "freebsd"
-#elif defined(__NetBSD__)
-# define DP_OS_NAME            "NetBSD"
-# define DP_OS_STR             "netbsd"
-#elif defined(__OpenBSD__)
-# define DP_OS_NAME            "OpenBSD"
-# define DP_OS_STR             "openbsd"
-#elif defined(__DragonFly__)
-# define DP_OS_NAME            "DragonFlyBSD"
-# define DP_OS_STR             "dragonflybsd"
-#elif defined(MACOSX)
-# define DP_OS_NAME            "Mac OS X"
-# define DP_OS_STR             "osx"
-#elif defined(__MORPHOS__)
-# define DP_OS_NAME            "MorphOS"
-# define DP_OS_STR             "morphos"
-#elif defined (sun) || defined (__sun)
-# if defined (__SVR4) || defined (__svr4__)
-#  define DP_OS_NAME   "Solaris"
-#  define DP_OS_STR            "solaris"
-# else
-#  define DP_OS_NAME   "SunOS"
-#  define DP_OS_STR            "sunos"
-# endif
-#else
-# define DP_OS_NAME            "Unknown"
-# define DP_OS_STR             "unknown"
-#endif
-
-#if defined(__GNUC__) || (__clang__)
-# if defined(__i386__)
-#  define DP_ARCH_STR          "686"
-#  define SSE_POSSIBLE
-#  ifdef __SSE__
-#   define SSE_PRESENT
-#  endif
-#  ifdef __SSE2__
-#   define SSE2_PRESENT
-#  endif
-# elif defined(__x86_64__)
-#  define DP_ARCH_STR          "x86_64"
-#  define SSE_PRESENT
-#  define SSE2_PRESENT
-# elif defined(__powerpc__)
-#  define DP_ARCH_STR          "ppc"
-# endif
-#elif defined(_WIN64)
-# define DP_ARCH_STR           "x86_64"
-# define SSE_PRESENT
-# define SSE2_PRESENT
-#elif defined(WIN32)
-# define DP_ARCH_STR           "x86"
-# define SSE_POSSIBLE
-#endif
-
-#ifdef SSE_PRESENT
-# define SSE_POSSIBLE
-#endif
-
-#ifdef NO_SSE
-# undef SSE_PRESENT
-# undef SSE_POSSIBLE
-# undef SSE2_PRESENT
-#endif
-
-#ifdef SSE_POSSIBLE
-// runtime detection of SSE/SSE2 capabilities for x86
-qbool Sys_HaveSSE(void);
-qbool Sys_HaveSSE2(void);
-#else
-#define Sys_HaveSSE() false
-#define Sys_HaveSSE2() false
-#endif
-
 #include "glquake.h"
-
 #include "palette.h"
-extern cvar_t host_isclient;
+
+extern qbool noclip_anglehack;
 
 /// skill level for currently loaded level (in case the user changes the cvar while the level is running, this reflects the level actually in use)
 extern int current_skill;
@@ -330,35 +176,5 @@ void Sys_Shared_Init(void);
 // debug protocol exploits.
 #define DEMOMSG_CLIENT_TO_SERVER 0x80000000
 
-// In Quake, any char in 0..32 counts as whitespace
-//#define ISWHITESPACE(ch) ((unsigned char) ch <= (unsigned char) ' ')
-#define ISWHITESPACE(ch) (!(ch) || (ch) == ' ' || (ch) == '\t' || (ch) == '\r' || (ch) == '\n')
-#define ISCOMMENT(ch, pos) ch[pos] == '/' && ch[pos + 1] == '/' && (pos == 0 || ISWHITESPACE(ch[pos - 1]))
-// This also includes extended characters, and ALL control chars
-#define ISWHITESPACEORCONTROL(ch) ((signed char) (ch) <= (signed char) ' ')
-
-
-#ifdef PRVM_64
-#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000
-#define FLOAT_LOSSLESS_FORMAT "%.17g"
-#define VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g"
-#else
-#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFF) // also match "negative zero" floats of value 0x80000000
-#define FLOAT_LOSSLESS_FORMAT "%.9g"
-#define VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
-#endif
-
-// originally this was _MSC_VER
-// but here we want to test the system libc, which on win32 is borked, and NOT the compiler
-#ifdef WIN32
-#define INT_LOSSLESS_FORMAT_SIZE "I64"
-#define INT_LOSSLESS_FORMAT_CONVERT_S(x) ((__int64)(x))
-#define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((unsigned __int64)(x))
-#else
-#define INT_LOSSLESS_FORMAT_SIZE "j"
-#define INT_LOSSLESS_FORMAT_CONVERT_S(x) ((intmax_t)(x))
-#define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((uintmax_t)(x))
-#endif
-
 #endif
 

diff --git a/snd_mem.c b/snd_mem.c
index bc664fa0031bb857826e197b637ad229cd096bf8..87dccbd06a69f0b9522692c4ae1196c55f147fee 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
 #include "snd_main.h"
 #include "snd_ogg.h"
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "snd_xmp.h"
 #endif
 
+void SCR_PushLoadingScreen (const char *, float);
+void SCR_PopLoadingScreen (qbool);
 
 /*
 ====================

diff --git a/snd_ogg.c b/snd_ogg.c
index e0cb0f48b91379f10cedd8c15502ae15ca569010..315ec20246d9f1056305d0024830284d47093acb 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -22,7 +22,7 @@
 */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "snd_main.h"
 #include "snd_ogg.h"
 #include "snd_wav.h"

diff --git a/snd_sdl.c b/snd_sdl.c
index 680d53e7aaa3b6d63c5c0997a006d1d396bc8bb6..e93d302113f31e5cb509faa5f5824c584ae21a1f 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <math.h>
 #include <SDL.h>
 
-#include "quakedef.h"
+#include "darkplaces.h"
+#include "vid.h"
 
 #include "snd_main.h"
 

diff --git a/snd_wav.c b/snd_wav.c
index e5d4752319850ac6928fe07a2c32222960c90571..66c8d62783e10ee0b427231222d4b2e0a96b9276 100644 (file)
--- a/snd_wav.c
+++ b/snd_wav.c
@@ -22,7 +22,7 @@
 */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "snd_main.h"
 #include "snd_wav.h"
 

diff --git a/snd_wav.h b/snd_wav.h
index 65015d35b130a2d8f93acbfb9817fd748572ac04..d192d43abc58315b9b4e45be0b671f0054a8ae2b 100644 (file)
--- a/snd_wav.h
+++ b/snd_wav.h
@@ -25,6 +25,9 @@
 #ifndef SND_WAV_H
 #define SND_WAV_H
 
+#include "qtypes.h"
+#include "sound.h"
+#include "snd_main.h"
 
 extern const snd_fetcher_t wav_fetcher;
 

diff --git a/snd_xmp.c b/snd_xmp.c
index 2bcb26755e13120aec96a8cf8915c5a9f0f4e9c2..20cf55bb257bf840d1382931b1e827cc52425820 100644 (file)
--- a/snd_xmp.c
+++ b/snd_xmp.c
@@ -20,7 +20,7 @@
  */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "snd_main.h"
 #include "snd_xmp.h"
 

diff --git a/sys.h b/sys.h
index a44efae8ea97952d36e66a6d4979b7fefbc1af7d..e1b6c393ed55d600feced126ef64e13309364efd 100644 (file)
--- a/sys.h
+++ b/sys.h
@@ -25,6 +25,116 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "qtypes.h"
 #include "cvar.h"
 
+/* Preprocessor macros to identify platform
+    DP_OS_NAME         - "friendly" name of the OS, for humans to read
+    DP_OS_STR  - "identifier" of the OS, more suited for code to use
+    DP_ARCH_STR        - "identifier" of the processor architecture
+ */
+#if defined(__ANDROID__) /* must come first because it also defines linux */
+# define DP_OS_NAME            "Android"
+# define DP_OS_STR             "android"
+# define USE_GLES2             1
+# define USE_RWOPS             1
+# define LINK_TO_ZLIB  1
+# define LINK_TO_LIBVORBIS 1
+#ifdef USEXMP
+# define LINK_TO_LIBXMP 1 // nyov: if someone can test with the android NDK compiled libxmp?
+#endif
+# define DP_MOBILETOUCH        1
+# define DP_FREETYPE_STATIC 1
+#elif TARGET_OS_IPHONE /* must come first because it also defines MACOSX */
+# define DP_OS_NAME            "iPhoneOS"
+# define DP_OS_STR             "iphoneos"
+# define USE_GLES2             1
+# define LINK_TO_ZLIB  1
+# define LINK_TO_LIBVORBIS 1
+# define DP_MOBILETOUCH        1
+# define DP_FREETYPE_STATIC 1
+#elif defined(__linux__)
+# define DP_OS_NAME            "Linux"
+# define DP_OS_STR             "linux"
+#elif defined(_WIN64)
+# define DP_OS_NAME            "Windows64"
+# define DP_OS_STR             "win64"
+#elif defined(WIN32)
+# define DP_OS_NAME            "Windows"
+# define DP_OS_STR             "win32"
+#elif defined(__FreeBSD__)
+# define DP_OS_NAME            "FreeBSD"
+# define DP_OS_STR             "freebsd"
+#elif defined(__NetBSD__)
+# define DP_OS_NAME            "NetBSD"
+# define DP_OS_STR             "netbsd"
+#elif defined(__OpenBSD__)
+# define DP_OS_NAME            "OpenBSD"
+# define DP_OS_STR             "openbsd"
+#elif defined(__DragonFly__)
+# define DP_OS_NAME            "DragonFlyBSD"
+# define DP_OS_STR             "dragonflybsd"
+#elif defined(MACOSX)
+# define DP_OS_NAME            "Mac OS X"
+# define DP_OS_STR             "osx"
+#elif defined(__MORPHOS__)
+# define DP_OS_NAME            "MorphOS"
+# define DP_OS_STR             "morphos"
+#elif defined (sun) || defined (__sun)
+# if defined (__SVR4) || defined (__svr4__)
+#  define DP_OS_NAME   "Solaris"
+#  define DP_OS_STR            "solaris"
+# else
+#  define DP_OS_NAME   "SunOS"
+#  define DP_OS_STR            "sunos"
+# endif
+#else
+# define DP_OS_NAME            "Unknown"
+# define DP_OS_STR             "unknown"
+#endif
+
+#if defined(__GNUC__) || (__clang__)
+# if defined(__i386__)
+#  define DP_ARCH_STR          "686"
+#  define SSE_POSSIBLE
+#  ifdef __SSE__
+#   define SSE_PRESENT
+#  endif
+#  ifdef __SSE2__
+#   define SSE2_PRESENT
+#  endif
+# elif defined(__x86_64__)
+#  define DP_ARCH_STR          "x86_64"
+#  define SSE_PRESENT
+#  define SSE2_PRESENT
+# elif defined(__powerpc__)
+#  define DP_ARCH_STR          "ppc"
+# endif
+#elif defined(_WIN64)
+# define DP_ARCH_STR           "x86_64"
+# define SSE_PRESENT
+# define SSE2_PRESENT
+#elif defined(WIN32)
+# define DP_ARCH_STR           "x86"
+# define SSE_POSSIBLE
+#endif
+
+#ifdef SSE_PRESENT
+# define SSE_POSSIBLE
+#endif
+
+#ifdef NO_SSE
+# undef SSE_PRESENT
+# undef SSE_POSSIBLE
+# undef SSE2_PRESENT
+#endif
+
+#ifdef SSE_POSSIBLE
+// runtime detection of SSE/SSE2 capabilities for x86
+qbool Sys_HaveSSE(void);
+qbool Sys_HaveSSE2(void);
+#else
+#define Sys_HaveSSE() false
+#define Sys_HaveSSE2() false
+#endif
+
 typedef struct sys_s
 {
        int argc;

diff --git a/sys_sdl.c b/sys_sdl.c
index 72d12264141f8a10e5e81779480557644c38a420..982956b1bd942a22ef1016f61fe845390b57ccf6 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,3 +1,4 @@
+#include "darkplaces.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -23,8 +24,6 @@
 #endif
 #endif
 
-#include "quakedef.h"
-
 sys_t sys;
 
 // =======================================================================

diff --git a/sys_unix.c b/sys_unix.c
index c7f9acb336b8ca235f2d7db09048ba54f43f3adc..031c55d8d9353dbb0f153928e5d100256efe6b4a 100644 (file)
--- a/sys_unix.c
+++ b/sys_unix.c
@@ -12,7 +12,7 @@
 
 #include <signal.h>
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
 sys_t sys;
 

diff --git a/utf8lib.c b/utf8lib.c
index 9a1ed298d9b14301a917c6003a5bc2f6e57b2d2f..155b4aea9a8f949ecf8e2a583487c4fa122896cc 100644 (file)
--- a/utf8lib.c
+++ b/utf8lib.c
@@ -1,5 +1,6 @@
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "utf8lib.h"
+#include "draw.h"
 
 /*
 ================================================================================

diff --git a/zone.c b/zone.c
index 0254a15e0299337b7cf6b08f1aa5c98cd1abf225..bba4ea3627f5e77d6d5889121e1ca10e4b423edb 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -19,8 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // Z_zone.c
 
-#include "quakedef.h"
-#include "thread.h"
+#include "darkplaces.h"
+
+void R_TextureStats_Print(qbool, qbool, qbool);
+void GL_Mesh_ListVBOs(qbool);
 
 #ifdef WIN32
 #include <windows.h>
@@ -29,11 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #endif
 
-#ifdef _MSC_VER
-#include <vadefs.h>
-#else
-#include <stdint.h>
-#endif
 #define MEMHEADER_SENTINEL_FOR_ADDRESS(p) ((sentinel_seed ^ (unsigned int) (uintptr_t) (p)) + sentinel_seed)
 unsigned int sentinel_seed;