Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates to the MS Visual C build system

Browse Source
This commit is contained in:
David Player 2010-03-18 11:32:42 +01:00 committed by Moritz Bunkus
parent cdcffaef3f
commit 66554b918c
5 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config.windows.h
View File

@ -4,15 +4,12 @@
#define PACKAGE "mkvtoolnix" #define PACKAGE "mkvtoolnix"
#define VERSION "3.2.0" #define VERSION "3.2.0"
#pragma warning(disable:4018) #pragma warning(disable:4018) //signed/unsigned mismatch
#pragma warning(disable:4244) #pragma warning(disable:4244) //conversion; possible loss of data
#pragma warning(disable:4146) #pragma warning(disable:4290) //C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
#pragma warning(disable:4996) #pragma warning(disable:4334) //'operator' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
#pragma warning(disable:4805) #pragma warning(disable:4800) //forcing value to bool 'true' or 'false' (performance warning)
#pragma warning(disable:4334) #pragma warning(disable:4996) //'function': was declared deprecated
#pragma warning(disable:4800)
#pragma warning(disable:4290)
#pragma warning(disable:4305)
#define HAVE_BOOST 1 #define HAVE_BOOST 1
#define HAVE_BOOST_FILESYSTEM 1 #define HAVE_BOOST_FILESYSTEM 1

3
src/common/checksums.cpp
View File

@ -75,6 +75,9 @@ static struct {
{ 1, 32, 0xEDB88320 }, { 1, 32, 0xEDB88320 },
}; };
static uint32_t s_crc_table[CRC_MAX][257]; static uint32_t s_crc_table[CRC_MAX][257];
#ifdef COMP_MSC
#pragma warning(disable:4146) //unary minus operator applied to unsigned type, result still unsigned
#endif
int int
crc_init(uint32_t *ctx, crc_init(uint32_t *ctx,

4
src/extract/xtr_aac.cpp
View File

@ -100,6 +100,10 @@ xtr_aac_c::create_file(xtr_base_c *master,
m_srate_idx = 11; m_srate_idx = 11;
} }
#ifdef COMP_MSC
#pragma warning(disable:4309) //truncation of constant data. 0xff is an int.
#endif
void void
xtr_aac_c::handle_frame(memory_cptr &frame, xtr_aac_c::handle_frame(memory_cptr &frame,
KaxBlockAdditions *additions, KaxBlockAdditions *additions,

44
winbuild/common.vcproj
View File

@ -383,26 +383,6 @@
RelativePath="..\src\common\wavpack.cpp" RelativePath="..\src\common\wavpack.cpp"
> >
</File> </File>
<File
RelativePath="..\src\common\tags\writer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\writer_collision.obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\writer_collision.obj"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\src\common\chapters\writer.cpp" RelativePath="..\src\common\chapters\writer.cpp"
> >
@ -423,6 +403,26 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\src\common\tags\writer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\writer_collision.obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\writer_collision.obj"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\src\common\xml\xml.cpp" RelativePath="..\src\common\xml\xml.cpp"
> >
@ -728,10 +728,6 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
</Filter> </Filter>
<File
RelativePath="..\src\common\Makefile.in"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

8
winbuild/info.vcproj
View File

@ -193,6 +193,14 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\src\info\mkvinfo.h"
>
</File>
<File
RelativePath="..\src\info\wxwidgets_ui.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"