Add license info for libogg/libvorbis

Fix VC2005 Vulkan renderer compilation Fix clang compiler warning on libvorbis Misc fixes/cleanups
ec- · Jul 26, 2023 · 5adf9e3 · 5adf9e3
1 parent fd916b6
commit 5adf9e3
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 65 deletions.
diff --git a/code/botlib/be_aas_move.c b/code/botlib/be_aas_move.c
@@ -227,10 +227,10 @@ int AAS_Swimming(vec3_t origin)
 // Returns: -
 // Changes Globals: -
 //===========================================================================
-static vec3_t VEC_UP = {0, -1, 0};
-static vec3_t MOVEDIR_UP = {0, 0, 1};
-static vec3_t VEC_DOWN = {0, -2, 0};
-static vec3_t MOVEDIR_DOWN = {0, 0, -1};
+static const vec3_t VEC_UP = {0, -1, 0};
+static const vec3_t MOVEDIR_UP = {0, 0, 1};
+static const vec3_t VEC_DOWN = {0, -2, 0};
+static const vec3_t MOVEDIR_DOWN = {0, 0, -1};
 
 void AAS_SetMovedir(vec3_t angles, vec3_t movedir)
 {

diff --git a/code/client/cl_main.c b/code/client/cl_main.c
@@ -2987,8 +2987,6 @@ CL_Frame
 ==================
 */
 void CL_Frame( int msec, int realMsec ) {
- float fps;
- float frameDuration;
 
 #ifdef USE_CURL
  if ( download.cURL ) {
@@ -3036,6 +3034,7 @@ void CL_Frame( int msec, int realMsec ) {
  if ( CL_VideoRecording() && msec ) {
  // save the current screen
  if ( cls.state == CA_ACTIVE || cl_forceavidemo->integer ) {
+ float fps, frameDuration;
 
  if ( com_timescale->value > 0.0001f )
  fps = MIN( cl_aviFrameRate->value / com_timescale->value, 1000.0f );
@@ -3075,7 +3074,7 @@ void CL_Frame( int msec, int realMsec ) {
  // Replace the ":" in the address as it is not a valid
  // file name character
  p = strchr( serverName, ':' );
- if( p ) {
+ if ( p ) {
  *p = '.';
  }
 
@@ -3085,9 +3084,9 @@ void CL_Frame( int msec, int realMsec ) {
  Cbuf_ExecuteText( EXEC_NOW,
  va( "record %s-%s-%s", nowString, serverName, mapName ) );
  }
- else if( cls.state != CA_ACTIVE && clc.demorecording ) {
+ else if ( cls.state != CA_ACTIVE && clc.demorecording ) {
  // Recording, but not CA_ACTIVE, so stop recording
- CL_StopRecord_f( );
+ CL_StopRecord_f();
  }
  }
 

diff --git a/code/libogg/COPYING b/code/libogg/COPYING
@@ -0,0 +1,28 @@
+Copyright (c) 2002, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/code/libvorbis/COPYING b/code/libvorbis/COPYING
@@ -0,0 +1,28 @@
+Copyright (c) 2002-2020 Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/code/libvorbis/lib/floor1.c b/code/libvorbis/lib/floor1.c
@@ -455,7 +455,7 @@ static int accumulate_fit(const float *flr,const float *mdct,
 
 static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1,
  vorbis_info_floor1 *info){
- double xb=0,yb=0,x2b=0,y2b=0,xyb=0,bn=0;
+ double xb=0,yb=0,x2b=0/*,y2b=0*/,xyb=0,bn=0;
  int i;
  int x0=a[0].x0;
  int x1=a[fits-1].x1;
@@ -466,7 +466,7 @@ static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1,
  xb+=a[i].xb + a[i].xa * weight;
  yb+=a[i].yb + a[i].ya * weight;
  x2b+=a[i].x2b + a[i].x2a * weight;
- y2b+=a[i].y2b + a[i].y2a * weight;
+ /*y2b+=a[i].y2b + a[i].y2a * weight;*/
  xyb+=a[i].xyb + a[i].xya * weight;
  bn+=a[i].bn + a[i].an * weight;
  }
@@ -475,7 +475,7 @@ static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1,
  xb+= x0;
  yb+= *y0;
  x2b+= x0 * x0;
- y2b+= *y0 * *y0;
+ /*y2b+= *y0 * *y0;*/
  xyb+= *y0 * x0;
  bn++;
  }
@@ -484,7 +484,7 @@ static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1,
  xb+= x1;
  yb+= *y1;
  x2b+= x1 * x1;
- y2b+= *y1 * *y1;
+ /*y2b+= *y1 * *y1;*/
  xyb+= *y1 * x1;
  bn++;
  }

diff --git a/code/renderervk/vk.c b/code/renderervk/vk.c
@@ -6591,7 +6591,7 @@ void vk_begin_frame( void )
  vk.cmd_index %= NUM_COMMAND_BUFFERS;
 
  if ( !ri.CL_IsMinimized() ) {
- res = qvkAcquireNextImageKHR( vk.device, vk.swapchain, 5 * 1000000000LLU, vk.cmd->image_acquired, VK_NULL_HANDLE, &vk.swapchain_image_index );
+ res = qvkAcquireNextImageKHR( vk.device, vk.swapchain, 5 * 1000000000ULL, vk.cmd->image_acquired, VK_NULL_HANDLE, &vk.swapchain_image_index );
  // when running via RDP: "Application has already acquired the maximum number of images (0x2)"
  // probably caused by "device lost" errors
  if ( res < 0 ) {

diff --git a/code/win32/msvc2005/botlib.vcproj b/code/win32/msvc2005/botlib.vcproj
@@ -50,8 +50,6 @@
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
@@ -109,8 +107,6 @@
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
@@ -175,15 +171,12 @@
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
  />
  <Tool
  Name="VCLibrarianTool"
- SuppressStartupBanner="true"
  />
  <Tool
  Name="VCALinkTool"
@@ -224,7 +217,6 @@
  />
  <Tool
  Name="VCMIDLTool"
- TargetEnvironment="3"
  />
  <Tool
  Name="VCCLCompilerTool"
@@ -236,22 +228,19 @@
  AssemblerListingLocation="$(IntDir)\"
  BrowseInformation="1"
  WarningLevel="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
  />
  <Tool
  Name="VCLibrarianTool"
- SuppressStartupBanner="true"
  />
  <Tool
  Name="VCALinkTool"

diff --git a/code/win32/msvc2005/libjpeg.vcproj b/code/win32/msvc2005/libjpeg.vcproj
@@ -43,11 +43,10 @@
  Name="VCCLCompilerTool"
  Optimization="0"
  PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
  BasicRuntimeChecks="3"
  RuntimeLibrary="1"
  AssemblerListingLocation="$(IntDir)\"
- WarningLevel="3"
+ WarningLevel="2"
  DebugInformationFormat="4"
  />
  <Tool
@@ -104,12 +103,11 @@
  Name="VCCLCompilerTool"
  Optimization="0"
  PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)"
- MinimalRebuild="true"
  BasicRuntimeChecks="3"
  RuntimeLibrary="1"
  AssemblerListingLocation="$(IntDir)\"
- WarningLevel="3"
- DebugInformationFormat="4"
+ WarningLevel="2"
+ DebugInformationFormat="3"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"
@@ -145,7 +143,6 @@
  IntermediateDirectory=".\build\$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
  ConfigurationType="4"
  CharacterSet="0"
- WholeProgramOptimization="1"
  >
  <Tool
  Name="VCPreBuildEventTool"
@@ -168,6 +165,7 @@
  PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)"
  RuntimeLibrary="0"
  AssemblerListingLocation="$(IntDir)\"
+ WarningLevel="2"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"
@@ -203,7 +201,6 @@
  IntermediateDirectory=".\build\$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
  ConfigurationType="4"
  CharacterSet="0"
- WholeProgramOptimization="1"
  >
  <Tool
  Name="VCPreBuildEventTool"
@@ -226,6 +223,7 @@
  PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
  RuntimeLibrary="0"
  AssemblerListingLocation="$(IntDir)\"
+ WarningLevel="2"
  CompileAs="1"
  />
  <Tool

diff --git a/code/win32/msvc2005/libogg.vcproj b/code/win32/msvc2005/libogg.vcproj
@@ -106,7 +106,8 @@
  BasicRuntimeChecks="3"
  RuntimeLibrary="1"
  AssemblerListingLocation="$(IntDir)\"
- DebugInformationFormat="4"
+ WarningLevel="2"
+ DebugInformationFormat="3"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"
@@ -142,7 +143,6 @@
  IntermediateDirectory=".\build\$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
  ConfigurationType="4"
  CharacterSet="2"
- WholeProgramOptimization="1"
  >
  <Tool
  Name="VCPreBuildEventTool"

diff --git a/code/win32/msvc2005/libvorbis.vcproj b/code/win32/msvc2005/libvorbis.vcproj
@@ -106,7 +106,7 @@
  PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)"
  RuntimeLibrary="1"
  AssemblerListingLocation="$(IntDir)\"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"

diff --git a/code/win32/msvc2005/quake3e.vcproj b/code/win32/msvc2005/quake3e.vcproj
@@ -51,7 +51,6 @@
  BrowseInformation="1"
  BrowseInformationFile="$(IntDir)\"
  WarningLevel="3"
- Detect64BitPortabilityProblems="true"
  DebugInformationFormat="4"
  />
  <Tool

diff --git a/code/win32/msvc2005/renderer.vcproj b/code/win32/msvc2005/renderer.vcproj
@@ -51,8 +51,6 @@
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
@@ -99,7 +97,6 @@
  />
  <Tool
  Name="VCMIDLTool"
- TargetEnvironment="3"
  />
  <Tool
  Name="VCCLCompilerTool"
@@ -112,8 +109,6 @@
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
@@ -170,16 +165,13 @@
  AssemblerListingLocation="$(IntDir)\"
  BrowseInformation="1"
  WarningLevel="3"
- SuppressStartupBanner="true"
  DebugInformationFormat="4"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"
@@ -226,7 +218,6 @@
  />
  <Tool
  Name="VCMIDLTool"
- TargetEnvironment="3"
  />
  <Tool
  Name="VCCLCompilerTool"
@@ -237,16 +228,13 @@
  AssemblerListingLocation="$(IntDir)\"
  BrowseInformation="1"
  WarningLevel="3"
- SuppressStartupBanner="true"
  DebugInformationFormat="3"
  />
  <Tool
  Name="VCManagedResourceCompilerTool"
  />
  <Tool
  Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
  />
  <Tool
  Name="VCPreLinkEventTool"