-disabled a couple of warnings

-changed "/MACHINE:I386" to "/MACHINE:X86"
-removed "Wp64" switch
-minor changes in some resources (translators: don't translate the "CompanyName")

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1509 10f7b99b-c216-0410-bff0-8a66a9350fd8

9 files changed, 15 insertions, 10 deletions

diff --git a/src/apps/mplayerc/mplayerc.cz.rc b/src/apps/mplayerc/mplayerc.cz.rc
index 39f3c98e9..992bdc2cb 100644
--- a/src/apps/mplayerc/mplayerc.cz.rc
+++ b/src/apps/mplayerc/mplayerc.cz.rc
diff --git a/src/apps/mplayerc/mplayerc.de.rc b/src/apps/mplayerc/mplayerc.de.rc
index 987a70997..07ee11f1f 100644
--- a/src/apps/mplayerc/mplayerc.de.rc
+++ b/src/apps/mplayerc/mplayerc.de.rc
diff --git a/src/apps/mplayerc/mplayerc.fr.rc b/src/apps/mplayerc/mplayerc.fr.rc
index 9a2b70da7..a669eaa34 100644
--- a/src/apps/mplayerc/mplayerc.fr.rc
+++ b/src/apps/mplayerc/mplayerc.fr.rc
diff --git a/src/apps/mplayerc/mplayerc.it.rc b/src/apps/mplayerc/mplayerc.it.rc
index 3ad2b6f96..64421ed1a 100644
--- a/src/apps/mplayerc/mplayerc.it.rc
+++ b/src/apps/mplayerc/mplayerc.it.rc
diff --git a/src/apps/mplayerc/mplayerc.pl.rc b/src/apps/mplayerc/mplayerc.pl.rc
index fcd31ddfe..a318253ad 100644
--- a/src/apps/mplayerc/mplayerc.pl.rc
+++ b/src/apps/mplayerc/mplayerc.pl.rc
diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index fd45818a6..fd941f76d 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -73,7 +73,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib detours.lib qtmlClient.lib wmstub.lib dxguid.lib Dsound.lib strmbaseRU.lib dsutilRU.lib subpicRU.lib subtitlesRU.lib libssfRU.lib asyncreaderRU.lib audioswitcherRU.lib avi2ac3filterRU.lib bufferfilterRU.lib cddareaderRU.lib cdxareaderRU.lib d2vsourceRU.lib decssfilterRU.lib flicsourceRU.lib dtsac3sourceRU.lib basesourceRU.lib wavdestRU.lib shoutcastsourceRU.lib streamdrivethruRU.lib vtsreaderRU.lib basesplitterRU.lib MatroskaSplitterRU.lib MatroskaMuxerRU.lib RealMediaSplitterRU.lib AviSplitterRU.lib Mpeg2DecFilterRU.lib MpaDecFilterRU.lib RoQSplitterRU.lib OggSplitterRU.lib NutSplitterRU.lib MpegSplitterRU.lib DiracSplitterRU.lib MpaSplitterRU.lib DSMSplitterRU.lib BaseMuxerRU.lib DSMMuxerRU.lib UDPReaderRU.lib FLVSplitterRU.lib zlibR.lib subtitlesourceRU.lib filtersRU.lib libvorbisidecR.lib SSFSplitterRU.lib MP4SplitterRU.lib libpngR.lib Setupapi.lib lgLcd.lib libLCDUIRU.lib MPCVideoDecRU.lib SyncClockRU.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				AdditionalLibraryDirectories="..\..\..\lib;..\..\..\lib\wm7;..\..\..\lib\qt6;..\..\..\lib\detours;..\..\..\lib\lglcd;..\..\..\lib\dx"

@@ -85,6 +84,7 @@
 				RandomizedBaseAddress="2"

 				DataExecutionPrevention="2"

 				SupportUnloadOfDelayLoadedDLL="true"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -253,7 +253,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib detours.lib qtmlClient.lib wmstub.lib Dsound.lib dxguid.lib strmbaseDU.lib dsutilDU.lib subpicDU.lib subtitlesDU.lib libssfDU.lib asyncreaderDU.lib audioswitcherDU.lib avi2ac3filterDU.lib bufferfilterDU.lib cddareaderDU.lib cdxareaderDU.lib d2vsourceDU.lib decssfilterDU.lib flicsourceDU.lib dtsac3sourceDU.lib basesourceDU.lib subtitlesourceDU.lib wavdestDU.lib shoutcastsourceDU.lib streamdrivethruDU.lib vtsreaderDU.lib basesplitterDU.lib MatroskaSplitterDU.lib MatroskaMuxerDU.lib RealMediaSplitterDU.lib AviSplitterDU.lib Mpeg2DecFilterDU.lib MpaDecFilterDU.lib RoQSplitterDU.lib OggSplitterDU.lib NutSplitterDU.lib MpegSplitterDU.lib DiracSplitterDU.lib MpaSplitterDU.lib DSMSplitterDU.lib BaseMuxerDU.lib DSMMuxerDU.lib UDPReaderDU.lib FLVSplitterDU.lib zlibD.lib filtersDU.lib libvorbisidecD.lib SSFSplitterDU.lib MP4SplitterDU.lib libpngD.lib Setupapi.lib lgLcd.lib libLCDUIDU.lib MPCVideoDecDU.lib SyncClockDU.lib"

 				ShowProgress="0"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

@@ -264,6 +263,7 @@
 				SubSystem="2"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

diff --git a/src/filters/misc/SyncClock/SyncClock.vcproj b/src/filters/misc/SyncClock/SyncClock.vcproj
index cf0c14fa2..2506009d8 100644
--- a/src/filters/misc/SyncClock/SyncClock.vcproj
+++ b/src/filters/misc/SyncClock/SyncClock.vcproj
@@ -53,7 +53,7 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="4"

 				CallingConvention="0"

 			/>

@@ -120,6 +120,7 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 				CallingConvention="2"

 			/>

@@ -216,6 +217,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -290,8 +292,8 @@
 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

+				RandomizedBaseAddress="2"

+				DataExecutionPrevention="2"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -365,6 +367,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -430,6 +433,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalLibraryDirectories="..\..\..\..\lib64"

 			/>

 			<Tool

diff --git a/src/filters/transform/mpadecfilter/libflac/src/libFLAC/libflac.vcproj b/src/filters/transform/mpadecfilter/libflac/src/libFLAC/libflac.vcproj
index 5ed898575..1c3919aad 100644
--- a/src/filters/transform/mpadecfilter/libflac/src/libFLAC/libflac.vcproj
+++ b/src/filters/transform/mpadecfilter/libflac/src/libFLAC/libflac.vcproj
@@ -49,12 +49,12 @@
 				Optimization="0"

 				AdditionalIncludeDirectories=".\include;..\..\include; ..\..\..\..\..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\&quot;1.2.0\&quot;;FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;_WINSOCK2API_"

-				MinimalRebuild="true"

+				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="2"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="4"

 				CompileAs="1"

 				DisableSpecificWarnings="4267;4996"

@@ -118,12 +118,12 @@
 				Optimization="0"

 				AdditionalIncludeDirectories=".\include;..\..\include; ..\..\..\..\..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\&quot;1.2.0\&quot;;FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;_WINSOCK2API_"

-				MinimalRebuild="true"

+				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="2"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 				CompileAs="1"

 				DisableSpecificWarnings="4267;4996"

@@ -264,7 +264,7 @@
 				BufferSecurityCheck="true"

 				UsePrecompiledHeader="0"

 				WarningLevel="2"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 				CompileAs="1"

 				DisableSpecificWarnings="4267;4996"

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index c9386a527..e85ccb353 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -162,6 +162,7 @@
 				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

 				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

 				DisableSpecificWarnings="4244"

 			/>

 			<Tool