This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Updates to the MS Visual C build system

  • Loading branch information...
1 parent cdcffae commit 66554b918c5eec3401a1581c8ccebf62d0167ea8 David Player committed with Mar 18, 2010
Showing with 27 additions and 19 deletions.
  1. +6 −9 config.windows.h
  2. +3 −0 src/common/checksums.cpp
  3. +4 −0 src/extract/xtr_aac.cpp
  4. +6 −10 winbuild/common.vcproj
  5. +8 −0 winbuild/info.vcproj
View
@@ -4,15 +4,12 @@
#define PACKAGE "mkvtoolnix"
#define VERSION "3.2.0"
-#pragma warning(disable:4018)
-#pragma warning(disable:4244)
-#pragma warning(disable:4146)
-#pragma warning(disable:4996)
-#pragma warning(disable:4805)
-#pragma warning(disable:4334)
-#pragma warning(disable:4800)
-#pragma warning(disable:4290)
-#pragma warning(disable:4305)
+#pragma warning(disable:4018) //signed/unsigned mismatch
+#pragma warning(disable:4244) //conversion; possible loss of data
+#pragma warning(disable:4290) //C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#pragma warning(disable:4334) //'operator' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
+#pragma warning(disable:4800) //forcing value to bool 'true' or 'false' (performance warning)
+#pragma warning(disable:4996) //'function': was declared deprecated
#define HAVE_BOOST 1
#define HAVE_BOOST_FILESYSTEM 1
View
@@ -75,6 +75,9 @@ static struct {
{ 1, 32, 0xEDB88320 },
};
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
crc_init(uint32_t *ctx,
View
@@ -100,6 +100,10 @@ xtr_aac_c::create_file(xtr_base_c *master,
m_srate_idx = 11;
}
+#ifdef COMP_MSC
+#pragma warning(disable:4309) //truncation of constant data. 0xff is an int.
+#endif
+
void
xtr_aac_c::handle_frame(memory_cptr &frame,
KaxBlockAdditions *additions,
View
@@ -384,42 +384,42 @@
>
</File>
<File
- RelativePath="..\src\common\tags\writer.cpp"
+ RelativePath="..\src\common\chapters\writer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\writer_collision.obj"
+ ObjectFile="$(IntDir)\writer_collision2.obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\writer_collision.obj"
+ ObjectFile="$(IntDir)\writer_collision2.obj"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\src\common\chapters\writer.cpp"
+ RelativePath="..\src\common\tags\writer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\writer_collision2.obj"
+ ObjectFile="$(IntDir)\writer_collision.obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\writer_collision2.obj"
+ ObjectFile="$(IntDir)\writer_collision.obj"
/>
</FileConfiguration>
</File>
@@ -728,10 +728,6 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
- <File
- RelativePath="..\src\common\Makefile.in"
- >
- </File>
</Files>
<Globals>
</Globals>
View
@@ -193,6 +193,14 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
+ <File
+ RelativePath="..\src\info\mkvinfo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\info\wxwidgets_ui.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"

0 comments on commit 66554b9

Please sign in to comment.