From: havoc Date: Sat, 6 Jun 2015 04:17:56 +0000 (+0000) Subject: Added MSVC++ 2013 projects, fixed a casting issue in C++ compilation of r_shadow.c. X-Git-Tag: xonotic-v0.8.5~88^2~111 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a93dd233045deeb0b8bdb07757ecba726421414;p=xonotic%2Fdarkplaces.git Added MSVC++ 2013 projects, fixed a casting issue in C++ compilation of r_shadow.c. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12210 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/darkplaces-dedicated-vs2013.vcxproj b/darkplaces-dedicated-vs2013.vcxproj new file mode 100644 index 00000000..ff19a776 --- /dev/null +++ b/darkplaces-dedicated-vs2013.vcxproj @@ -0,0 +1,384 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {389AE334-D907-4069-90B3-F0551B3EFDE9} + darkplacesdedicated + Win32Proj + darkplaces-dedicated-vs2013 + + + + Application + v120 + MultiByte + true + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + true + + + Application + v120 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + + + $(SolutionDir)$(Configuration)-$(ProjectName)\ + $(Configuration)-$(ProjectName)-DED\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)-DED\ + true + + + $(SolutionDir)\ + $(Configuration)-$(ProjectName)-DED\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)-DED\ + false + + + + Disabled + CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Console + MachineX86 + + + + + X64 + + + Disabled + CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Console + MachineX64 + + + + + MaxSpeed + true + CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Console + true + true + MachineX86 + + + + + X64 + + + MaxSpeed + true + CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Console + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/darkplaces-sdl-vs2013.vcxproj b/darkplaces-sdl-vs2013.vcxproj new file mode 100644 index 00000000..c7ddf274 --- /dev/null +++ b/darkplaces-sdl-vs2013.vcxproj @@ -0,0 +1,392 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51} + darkplacessdl + Win32Proj + darkplaces-sdl-vs2013 + + + + Application + v120 + MultiByte + true + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + true + + + Application + v120 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + + + $(SolutionDir)$(Configuration)-$(ProjectName)\ + $(Configuration)-$(ProjectName)-SDL\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)-SDL\ + true + + + $(SolutionDir)\ + $(Configuration)-$(ProjectName)-SDL\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)-SDL\ + false + + + + Disabled + CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level4 + EditAndContinue + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + MachineX86 + + + + + X64 + + + Disabled + CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level4 + ProgramDatabase + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + MachineX64 + + + + + MaxSpeed + true + CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level4 + ProgramDatabase + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + true + true + MachineX86 + + + + + X64 + + + MaxSpeed + true + CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level4 + ProgramDatabase + 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/darkplaces-vs2013.sln b/darkplaces-vs2013.sln new file mode 100644 index 00000000..ed2481d5 --- /dev/null +++ b/darkplaces-vs2013.sln @@ -0,0 +1,46 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2013.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2013.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2013.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64 + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|x64 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|x64 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|x64 + {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|x64 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64 + {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/darkplaces-wgl-vs2013.vcxproj b/darkplaces-wgl-vs2013.vcxproj new file mode 100644 index 00000000..de618afb --- /dev/null +++ b/darkplaces-wgl-vs2013.vcxproj @@ -0,0 +1,397 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28} + darkplaceswgl + Win32Proj + darkplaces-wgl-vs2013 + + + + Application + v120 + MultiByte + true + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + true + + + Application + v120 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + + + $(SolutionDir)$(Configuration)-$(ProjectName)\ + $(Configuration)-$(ProjectName)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)\ + $(Configuration)-$(ProjectName)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + Disabled + CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level4 + EditAndContinue + CompileAsCpp + 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + MachineX86 + + + + + X64 + + + Disabled + CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level4 + ProgramDatabase + CompileAsCpp + 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + MachineX64 + + + + + MaxSpeed + true + CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + CompileAsCpp + 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + true + true + MachineX86 + + + + + X64 + + + MaxSpeed + true + CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + CompileAsCpp + 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) + true + /wd"4201" %(AdditionalOptions) + + + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + /wd"4800" %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/r_shadow.c b/r_shadow.c index e4010bbc..b97ae62d 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -5169,7 +5169,7 @@ static void R_DrawCorona(rtlight_t *rtlight, float cscale, float scale) CHECKGLERROR // See if we can use the GPU-side method to prevent implicit sync if (vid.support.arb_query_buffer_object) { -#define BUFFER_OFFSET(i) ((void*)NULL + (i)) +#define BUFFER_OFFSET(i) ((GLint *)((unsigned char*)NULL + (i))) if (!r_shadow_occlusion_buf) { qglGenBuffersARB(1, &r_shadow_occlusion_buf); qglBindBufferARB(GL_QUERY_BUFFER_ARB, r_shadow_occlusion_buf);