From 3105aaee0545a233762a34a3d3322bb8261d418f Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 26 Sep 2013 23:27:19 +0000 Subject: [PATCH] fix several visual studio projects which did not have CONFIG_MENU added git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12015 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=168c67550738c884647609f43629688f8bf4d5f4 --- darkplaces-dedicated-vs2010.vcxproj | 6 +++--- darkplaces-dedicated-vs2012.vcxproj | 12 ++++++------ darkplaces-dedicated.vcproj | 4 ++-- darkplaces-sdl-vs2010.vcxproj | 6 +++--- darkplaces-sdl-vs2012.vcxproj | 12 ++++++------ darkplaces-sdl.vcproj | 4 ++-- darkplaces-wgl-vs2010.vcxproj | 6 +++--- darkplaces-wgl-vs2012.vcxproj | 12 ++++++------ darkplaces-wgl.vcproj | 4 ++-- vid_sdl.c | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/darkplaces-dedicated-vs2010.vcxproj b/darkplaces-dedicated-vs2010.vcxproj index e757f4f8..fe967ae6 100644 --- a/darkplaces-dedicated-vs2010.vcxproj +++ b/darkplaces-dedicated-vs2010.vcxproj @@ -51,7 +51,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -72,7 +72,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -281,4 +281,4 @@ - + \ No newline at end of file diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj index e28e719a..350f813a 100644 --- a/darkplaces-dedicated-vs2012.vcxproj +++ b/darkplaces-dedicated-vs2012.vcxproj @@ -81,7 +81,7 @@ true - $(SolutionDir)$(Configuration)-$(ProjectName)\ + $(SolutionDir)\ $(Configuration)-$(ProjectName)\ false @@ -93,7 +93,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +115,7 @@ Disabled - WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -135,7 +135,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -159,7 +159,7 @@ MaxSpeed true - WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -368,4 +368,4 @@ - + \ No newline at end of file diff --git a/darkplaces-dedicated.vcproj b/darkplaces-dedicated.vcproj index 4d676f96..312fb6fd 100755 --- a/darkplaces-dedicated.vcproj +++ b/darkplaces-dedicated.vcproj @@ -44,7 +44,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -73,7 +73,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -289,4 +289,4 @@ - + \ No newline at end of file diff --git a/darkplaces-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj index c3387750..83c9f30c 100644 --- a/darkplaces-sdl-vs2012.vcxproj +++ b/darkplaces-sdl-vs2012.vcxproj @@ -81,7 +81,7 @@ true - $(SolutionDir)$(Configuration)-$(ProjectName)\ + $(SolutionDir)\ $(Configuration)-$(ProjectName)\ false @@ -93,7 +93,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -116,7 +116,7 @@ Disabled - WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -137,7 +137,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -161,7 +161,7 @@ MaxSpeed true - WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -376,4 +376,4 @@ - + \ No newline at end of file diff --git a/darkplaces-sdl.vcproj b/darkplaces-sdl.vcproj index b76d7fd0..4914baed 100755 --- a/darkplaces-sdl.vcproj +++ b/darkplaces-sdl.vcproj @@ -44,7 +44,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -73,7 +73,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -293,4 +293,4 @@ - + \ No newline at end of file diff --git a/darkplaces-wgl-vs2012.vcxproj b/darkplaces-wgl-vs2012.vcxproj index 086fe0b7..fc12e286 100644 --- a/darkplaces-wgl-vs2012.vcxproj +++ b/darkplaces-wgl-vs2012.vcxproj @@ -81,7 +81,7 @@ true - $(SolutionDir)$(Configuration)-$(ProjectName)\ + $(SolutionDir)\ $(Configuration)-$(ProjectName)\ false @@ -93,7 +93,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -116,7 +116,7 @@ Disabled - WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -137,7 +137,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -162,7 +162,7 @@ MaxSpeed true - WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + CONFIG_MENU;WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -381,4 +381,4 @@ - + \ No newline at end of file diff --git a/darkplaces-wgl.vcproj b/darkplaces-wgl.vcproj index 23396853..21d6ff3e 100644 --- a/darkplaces-wgl.vcproj +++ b/darkplaces-wgl.vcproj @@ -44,7 +44,7 @@ current_w; desktop_mode.height = vi->current_h; desktop_mode.bpp = vi->vfmt->BitsPerPixel; @@ -2643,7 +2643,7 @@ static qboolean VID_InitModeSoft(viddef_mode_t *mode) vid_isfullscreen = false; if (mode->fullscreen) { #if SDL_MAJOR_VERSION == 1 - SDL_VideoInfo *vi = SDL_GetVideoInfo(); + const SDL_VideoInfo *vi = SDL_GetVideoInfo(); mode->width = vi->current_w; mode->height = vi->current_h; mode->bitsperpixel = vi->vfmt->BitsPerPixel; -- 2.39.2