[Scummvm-cvs-logs] SF.net SVN: scummvm:[40652] tools/trunk/dist

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun May 17 16:28:44 CEST 2009


Revision: 40652
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40652&view=rev
Author:   thebluegr
Date:     2009-05-17 14:28:43 +0000 (Sun, 17 May 2009)

Log Message:
-----------
- Added the missing MSVC8 project for the new compress_gob tool
- Enabled FLAC for ScummVM tools and fixed library bugs, thanks to comments by nolangs in bug report #2791338

Modified Paths:
--------------
    tools/trunk/dist/msvc8/compress_agos.vcproj
    tools/trunk/dist/msvc8/compress_kyra.vcproj
    tools/trunk/dist/msvc8/compress_queen.vcproj
    tools/trunk/dist/msvc8/compress_saga.vcproj
    tools/trunk/dist/msvc8/compress_scumm_bun.vcproj
    tools/trunk/dist/msvc8/compress_scumm_san.vcproj
    tools/trunk/dist/msvc8/compress_scumm_sou.vcproj
    tools/trunk/dist/msvc8/compress_sword1.vcproj
    tools/trunk/dist/msvc8/compress_sword2.vcproj
    tools/trunk/dist/msvc8/compress_touche.vcproj
    tools/trunk/dist/msvc8/encode_dxa.vcproj
    tools/trunk/dist/msvc9/compress_agos.vcproj
    tools/trunk/dist/msvc9/compress_kyra.vcproj
    tools/trunk/dist/msvc9/compress_queen.vcproj
    tools/trunk/dist/msvc9/compress_saga.vcproj
    tools/trunk/dist/msvc9/compress_scumm_bun.vcproj
    tools/trunk/dist/msvc9/compress_scumm_san.vcproj
    tools/trunk/dist/msvc9/compress_scumm_sou.vcproj
    tools/trunk/dist/msvc9/compress_sword1.vcproj
    tools/trunk/dist/msvc9/compress_sword2.vcproj
    tools/trunk/dist/msvc9/compress_touche.vcproj
    tools/trunk/dist/msvc9/encode_dxa.vcproj

Added Paths:
-----------
    tools/trunk/dist/msvc8/compress_gob.vcproj

Modified: tools/trunk/dist/msvc8/compress_agos.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_agos.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_agos.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Added: tools/trunk/dist/msvc8/compress_gob.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_gob.vcproj	                        (rev 0)
+++ tools/trunk/dist/msvc8/compress_gob.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="compress_gob"
+	ProjectGUID="{8C4BC409-2EEC-41F5-A017-972F38414289}"
+	RootNamespace="compress_gob"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4996"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/compress_gob.exe"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/compress_gob.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4996"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/compress_gob.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="libc.lib"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\compress_gob.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\util.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\util.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


Property changes on: tools/trunk/dist/msvc8/compress_gob.vcproj
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: tools/trunk/dist/msvc8/compress_kyra.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_kyra.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_kyra.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_queen.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_queen.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_queen.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_saga.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_saga.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_saga.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_scumm_bun.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_scumm_bun.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_scumm_bun.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_scumm_san.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_scumm_san.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_scumm_san.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_scumm_sou.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_scumm_sou.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_scumm_sou.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_sword1.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_sword1.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_sword1.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_sword2.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_sword2.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_sword2.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/compress_touche.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_touche.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/compress_touche.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc8/encode_dxa.vcproj
===================================================================
--- tools/trunk/dist/msvc8/encode_dxa.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc8/encode_dxa.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -63,7 +63,7 @@
 				AdditionalDependencies="zlib.lib libpng.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
 				OutputFile="$(OutDir)/encode_dxa.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;libcmtd.lib"
+				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/encode_dxa.pdb"
 				SubSystem="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>
@@ -137,7 +137,7 @@
 				AdditionalDependencies="zlib.lib libpng.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
 				OutputFile="$(OutDir)/encode_dxa.exe"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
+				IgnoreDefaultLibraryNames="libc.lib"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: tools/trunk/dist/msvc9/compress_agos.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_agos.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_agos.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_kyra.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_kyra.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_kyra.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_queen.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_queen.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_queen.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_saga.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_saga.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_saga.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_scumm_bun.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_scumm_bun.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_scumm_bun.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_scumm_san.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_scumm_san.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_scumm_san.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_scumm_sou.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_scumm_sou.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_scumm_sou.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_sword1.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_sword1.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_sword1.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_sword2.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_sword2.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_sword2.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/compress_touche.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_touche.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/compress_touche.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>

Modified: tools/trunk/dist/msvc9/encode_dxa.vcproj
===================================================================
--- tools/trunk/dist/msvc9/encode_dxa.vcproj	2009-05-17 14:22:05 UTC (rev 40651)
+++ tools/trunk/dist/msvc9/encode_dxa.vcproj	2009-05-17 14:28:43 UTC (rev 40652)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 				AdditionalDependencies="zlib.lib libpng.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
 				OutputFile="$(OutDir)/encode_dxa.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;libcmtd.lib"
+				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/encode_dxa.pdb"
 				SubSystem="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4996"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>
@@ -138,7 +138,7 @@
 				AdditionalDependencies="zlib.lib libpng.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
 				OutputFile="$(OutDir)/encode_dxa.exe"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
+				IgnoreDefaultLibraryNames="libc.lib"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list