ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3rd Party: Update project settings

This commit is contained in:
zilmar 2013-04-17 20:33:18 +10:00
parent 4cbd5c538d
commit 5c8b6fd2e2
8 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/3rd Party/7zip/7zip.vcproj
View File

@ -38,6 +38,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
DisableSpecificWarnings="4127"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -90,6 +91,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
DisableSpecificWarnings="4127"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

2
Source/3rd Party/wx/src/zlib/trees.c
View File

@ -203,7 +203,7 @@ local void send_bits(s, value, length)
* unused bits in value. * unused bits in value.
*/ */
if (s->bi_valid > (int)Buf_size - length) { if (s->bi_valid > (int)Buf_size - length) {
s->bi_buf |= (value << s->bi_valid); s->bi_buf |= (value << s->bi_valid) & 0xFFFF;
put_short(s, s->bi_buf); put_short(s, s->bi_buf);
s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
s->bi_valid += length - Buf_size; s->bi_valid += length - Buf_size;

26
Source/3rd Party/wx/wx_base.vcproj
View File

@ -39,7 +39,6 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="lib\vc_lib\mswud,include,src\tiff\libtiff,src\jpeg,src\png,src\zlib,src\regex,src\expat\lib" AdditionalIncludeDirectories="lib\vc_lib\mswud,include,src\tiff\libtiff,src\jpeg,src\png,src\zlib,src\regex,src\expat\lib"
PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
RuntimeLibrary="3"
PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderThrough="wx/wxprec.h"
DisableSpecificWarnings="4005" DisableSpecificWarnings="4005"
/> />
@ -96,7 +95,6 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="lib\vc_lib\mswu,include,src\tiff\libtiff,src\jpeg,src\png,src\zlib,src\regex,src\expat\lib" AdditionalIncludeDirectories="lib\vc_lib\mswu,include,src\tiff\libtiff,src\jpeg,src\png,src\zlib,src\regex,src\expat\lib"
PreprocessorDefinitions=";_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" PreprocessorDefinitions=";_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
RuntimeLibrary="2"
PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderThrough="wx/wxprec.h"
DisableSpecificWarnings="4005" DisableSpecificWarnings="4005"
/> />
@ -678,9 +676,9 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h" Description="Creating lib\vc_lib\mswud\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h&#x0D;&#x0A;" CommandLine="copy &quot;$(InputPath)&quot; lib\vc_lib\mswud\wx\setup.h&#x0D;&#x0A;"
Outputs="..\..\lib\vc_lib\mswud\wx\setup.h" Outputs="lib\vc_lib\mswud\wx\setup.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -688,9 +686,9 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h" Description="Creating lib\vc_lib\mswu\wx\setup.h"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h&#x0D;&#x0A;" CommandLine="copy &quot;$(InputPath)&quot; lib\vc_lib\mswu\wx\setup.h&#x0D;&#x0A;"
Outputs="..\..\lib\vc_lib\mswu\wx\setup.h" Outputs="lib\vc_lib\mswu\wx\setup.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
@ -738,9 +736,9 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" Description="Creating lib\vc_lib\mswud\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;" CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" Outputs="lib\vc_lib\mswud\wx\msw\rcdefs.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -748,9 +746,9 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" Description="Creating lib\vc_lib\mswu\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;" CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" Outputs="lib\vc_lib\mswu\wx\msw\rcdefs.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>

14
Source/3rd Party/wx/wx_core.vcproj
View File

@ -39,7 +39,6 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png" AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png"
PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0" PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0"
RuntimeLibrary="3"
PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderThrough="wx/wxprec.h"
DisableSpecificWarnings="4005" DisableSpecificWarnings="4005"
/> />
@ -96,7 +95,6 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png" AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png"
PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0" PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0"
RuntimeLibrary="2"
PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderThrough="wx/wxprec.h"
DisableSpecificWarnings="4005" DisableSpecificWarnings="4005"
/> />
@ -4059,11 +4057,11 @@
> >
</File> </File>
<File <File
RelativePath="include\wx\ribbon\panel.h" RelativePath="include\wx\panel.h"
> >
</File> </File>
<File <File
RelativePath="include\wx\panel.h" RelativePath="include\wx\ribbon\panel.h"
> >
</File> </File>
<File <File
@ -4411,11 +4409,11 @@
> >
</File> </File>
<File <File
RelativePath="include\wx\toplevel.h" RelativePath="include\wx\persist\toplevel.h"
> >
</File> </File>
<File <File
RelativePath="include\wx\persist\toplevel.h" RelativePath="include\wx\toplevel.h"
> >
</File> </File>
<File <File
@ -4423,11 +4421,11 @@
> >
</File> </File>
<File <File
RelativePath="include\wx\treebook.h" RelativePath="include\wx\persist\treebook.h"
> >
</File> </File>
<File <File
RelativePath="include\wx\persist\treebook.h" RelativePath="include\wx\treebook.h"
> >
</File> </File>
<File <File

4
Source/3rd Party/wx/wx_wxjpeg.vcproj
View File

@ -39,8 +39,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="lib\vc_lib\mswud" AdditionalIncludeDirectories="lib\vc_lib\mswud"
PreprocessorDefinitions="_LIB" PreprocessorDefinitions="_LIB"
RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -95,8 +95,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
PreprocessorDefinitions="_LIB" PreprocessorDefinitions="_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

4
Source/3rd Party/wx/wx_wxpng.vcproj
View File

@ -39,8 +39,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="src\zlib" AdditionalIncludeDirectories="src\zlib"
PreprocessorDefinitions="_LIB" PreprocessorDefinitions="_LIB"
RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -95,8 +95,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="src\zlib" AdditionalIncludeDirectories="src\zlib"
PreprocessorDefinitions="_LIB" PreprocessorDefinitions="_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

4
Source/3rd Party/wx/wx_wxzlib.vcproj
View File

@ -37,8 +37,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -92,8 +92,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="_LIB" PreprocessorDefinitions="_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

1
Source/3rd Party/zlib/zlib.vcproj
View File

@ -91,6 +91,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"