only respect vid_soft variable if SSE2_PRESENT is defined

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

diff --git a/dpsoftrast.c b/dpsoftrast.c
index 896716504aabf4b0f7eea493458e58f641f07ec1..884d454c1c2f1ef02688aac37190d60c5faed628 100644 (file)
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -1,19 +1,12 @@
 
-#include <memory.h>
-#include "dpsoftrast.h"
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
+#include "quakedef.h"
+#include "dpsoftrast.h"
 
-#undef true
-#undef false
 #ifndef __cplusplus
-typedef enum bool {false, true} bool;
-#endif
-
-#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#define RESTRICT __restrict
-#else
-#define RESTRICT
+typedef qboolean bool;
 #endif
 
 #define GL_NONE                                        0
@@ -4163,3 +4156,4 @@ void DPSOFTRAST_Shutdown(void)
                free(dpsoftrast.texture);
        memset(&dpsoftrast, 0, sizeof(dpsoftrast));
 }
+

diff --git a/vid_sdl.c b/vid_sdl.c
index 5c9ee27efebd05d7dd9fbd79320d3e463c2a0839..bd06cb7e35838bb139123483ec434ffca5624fcc 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1262,9 +1262,11 @@ qboolean VID_InitMode(viddef_mode_t *mode)
 {
        if (!SDL_WasInit(SDL_INIT_VIDEO) && SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
                Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
+#ifdef SSE2_PRESENT
        if (vid_soft.integer)
                return VID_InitModeSoft(mode);
        else
+#endif
                return VID_InitModeGL(mode);
 }