[Scummvm-cvs-logs] SF.net SVN: scummvm:[40623] tools/trunk
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat May 16 13:26:05 CEST 2009
Revision: 40623
http://scummvm.svn.sourceforge.net/scummvm/?rev=40623&view=rev
Author: thebluegr
Date: 2009-05-16 11:26:05 +0000 (Sat, 16 May 2009)
Log Message:
-----------
Updated the tools MSVC project files (with some modifications) from patch "2791338 - Fix Tools for MSVC8/9". I couldn't get it to compile with libFLAC support, so builtin FLAC support has been disabled
Modified Paths:
--------------
tools/trunk/compress.h
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/degob.vcproj
tools/trunk/dist/msvc8/dekyra.vcproj
tools/trunk/dist/msvc8/descumm.vcproj
tools/trunk/dist/msvc8/desword2.vcproj
tools/trunk/dist/msvc8/encode_dxa.vcproj
tools/trunk/dist/msvc8/extract_agos.vcproj
tools/trunk/dist/msvc8/extract_gob_stk.vcproj
tools/trunk/dist/msvc8/extract_kyra.vcproj
tools/trunk/dist/msvc8/extract_loom_tg16.vcproj
tools/trunk/dist/msvc8/extract_mm_apple.vcproj
tools/trunk/dist/msvc8/extract_mm_c64.vcproj
tools/trunk/dist/msvc8/extract_mm_nes.vcproj
tools/trunk/dist/msvc8/extract_parallaction.vcproj
tools/trunk/dist/msvc8/extract_scumm_mac.vcproj
tools/trunk/dist/msvc8/extract_zak_c64.vcproj
tools/trunk/dist/msvc8/tools.sln
tools/trunk/dist/msvc9/compress_agos.vcproj
tools/trunk/dist/msvc9/compress_gob.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/degob.vcproj
tools/trunk/dist/msvc9/dekyra.vcproj
tools/trunk/dist/msvc9/descumm.vcproj
tools/trunk/dist/msvc9/desword2.vcproj
tools/trunk/dist/msvc9/encode_dxa.vcproj
tools/trunk/dist/msvc9/extract_agos.vcproj
tools/trunk/dist/msvc9/extract_gob_stk.vcproj
tools/trunk/dist/msvc9/extract_kyra.vcproj
tools/trunk/dist/msvc9/extract_loom_tg16.vcproj
tools/trunk/dist/msvc9/extract_mm_apple.vcproj
tools/trunk/dist/msvc9/extract_mm_c64.vcproj
tools/trunk/dist/msvc9/extract_mm_nes.vcproj
tools/trunk/dist/msvc9/extract_parallaction.vcproj
tools/trunk/dist/msvc9/extract_scumm_mac.vcproj
tools/trunk/dist/msvc9/extract_zak_c64.vcproj
Modified: tools/trunk/compress.h
===================================================================
--- tools/trunk/compress.h 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/compress.h 2009-05-16 11:26:05 UTC (rev 40623)
@@ -28,6 +28,7 @@
#include <vorbis/vorbisenc.h>
#endif
#ifndef DISABLE_BUILTIN_FLAC
+#define FLAC__NO_DLL 1
#include <FLAC/stream_encoder.h>
#endif
Modified: tools/trunk/dist/msvc8/compress_agos.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_agos.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_agos.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_agos.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_agos.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_kyra.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_kyra.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_kyra.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -6,6 +6,7 @@
ProjectGUID="{B4D19F72-1F7B-48B2-8067-C6395B94DF05}"
RootNamespace="compress_kyra"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -17,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_kyra.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_kyra.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_queen.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_queen.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_queen.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_queen.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_queen.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_saga.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_saga.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_saga.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_saga.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_saga.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_scumm_bun.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_scumm_bun.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_scumm_bun.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_bun.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_bun.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_scumm_san.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_scumm_san.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_scumm_san.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,7 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib"
+ AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_san.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,11 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib"
+ AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_san.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_scumm_sou.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_scumm_sou.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_scumm_sou.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_sou.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_sou.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_sword1.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_sword1.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_sword1.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword1.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword1.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_sword2.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_sword2.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_sword2.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword2.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword2.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/compress_touche.vcproj
===================================================================
--- tools/trunk/dist/msvc8/compress_touche.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/compress_touche.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,6 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_touche.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_touche.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/degob.vcproj
===================================================================
--- tools/trunk/dist/msvc8/degob.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/degob.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/degob.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/dekyra.vcproj
===================================================================
--- tools/trunk/dist/msvc8/dekyra.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/dekyra.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/dekyra.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/descumm.vcproj
===================================================================
--- tools/trunk/dist/msvc8/descumm.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/descumm.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/descumm.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/desword2.vcproj
===================================================================
--- tools/trunk/dist/msvc8/desword2.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/desword2.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/desword2.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/encode_dxa.vcproj
===================================================================
--- tools/trunk/dist/msvc8/encode_dxa.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/encode_dxa.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -60,9 +60,10 @@
/>
<Tool
Name="VCLinkerTool"
+ 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"
+ IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;libcmtd.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/encode_dxa.pdb"
SubSystem="1"
@@ -94,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,10 +134,10 @@
/>
<Tool
Name="VCLinkerTool"
+ 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"
- GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_agos.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_agos.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_agos.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_agos.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_gob_stk.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_gob_stk.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_gob_stk.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_gob_stk.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_kyra.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_kyra.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_kyra.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_kyra.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -176,6 +174,10 @@
>
</File>
<File
+ RelativePath="..\..\kyra_ins.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\kyra_pak.cpp"
>
</File>
Modified: tools/trunk/dist/msvc8/extract_loom_tg16.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_loom_tg16.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_loom_tg16.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_loom_tg16.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_mm_apple.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_mm_apple.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_mm_apple.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_mm_apple.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_mm_c64.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_mm_c64.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_mm_c64.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_mm_c64.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_mm_nes.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_mm_nes.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_mm_nes.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE,SCUMMVM_USE_PRAGMA_PACK"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_mm_nes.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_parallaction.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_parallaction.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_parallaction.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_parallaction.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_scumm_mac.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_scumm_mac.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_scumm_mac.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_scumm_mac.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/extract_zak_c64.vcproj
===================================================================
--- tools/trunk/dist/msvc8/extract_zak_c64.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/extract_zak_c64.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -94,10 +94,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,11 +118,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,8 +135,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_zak_c64.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc8/tools.sln
===================================================================
--- tools/trunk/dist/msvc8/tools.sln 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc8/tools.sln 2009-05-16 11:26:05 UTC (rev 40623)
@@ -51,6 +51,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extract_parallaction", "extract_parallaction.vcproj", "{F4B04E6F-5916-44DA-A957-E8FA789D2CBC}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compress_gob", "compress_gob.vcproj", "{8C4BC409-2EEC-41F5-A017-972F38414289}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -97,6 +99,10 @@
{FF790984-B460-4B34-8471-26E66B8ECD4C}.Debug|Win32.Build.0 = Debug|Win32
{FF790984-B460-4B34-8471-26E66B8ECD4C}.Release|Win32.ActiveCfg = Release|Win32
{FF790984-B460-4B34-8471-26E66B8ECD4C}.Release|Win32.Build.0 = Release|Win32
+ {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Debug|Win32.Build.0 = Debug|Win32
+ {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Release|Win32.ActiveCfg = Release|Win32
+ {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Release|Win32.Build.0 = Release|Win32
{0B9A669F-83C2-4AE4-841F-3B015713605C}.Debug|Win32.ActiveCfg = Debug|Win32
{0B9A669F-83C2-4AE4-841F-3B015713605C}.Debug|Win32.Build.0 = Debug|Win32
{0B9A669F-83C2-4AE4-841F-3B015713605C}.Release|Win32.ActiveCfg = Release|Win32
@@ -117,6 +123,10 @@
{A59D7F94-4875-4337-8246-A28F21A1DF78}.Debug|Win32.Build.0 = Debug|Win32
{A59D7F94-4875-4337-8246-A28F21A1DF78}.Release|Win32.ActiveCfg = Release|Win32
{A59D7F94-4875-4337-8246-A28F21A1DF78}.Release|Win32.Build.0 = Release|Win32
+ {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Debug|Win32.Build.0 = Debug|Win32
+ {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Release|Win32.ActiveCfg = Release|Win32
+ {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Release|Win32.Build.0 = Release|Win32
{5BCEC6FE-1EDD-464F-B09A-660C9B706AFD}.Debug|Win32.ActiveCfg = Debug|Win32
{5BCEC6FE-1EDD-464F-B09A-660C9B706AFD}.Debug|Win32.Build.0 = Debug|Win32
{5BCEC6FE-1EDD-464F-B09A-660C9B706AFD}.Release|Win32.ActiveCfg = Release|Win32
@@ -149,14 +159,10 @@
{F4B04E6F-5916-44DA-A957-E8FA789D2CBC}.Debug|Win32.Build.0 = Debug|Win32
{F4B04E6F-5916-44DA-A957-E8FA789D2CBC}.Release|Win32.ActiveCfg = Release|Win32
{F4B04E6F-5916-44DA-A957-E8FA789D2CBC}.Release|Win32.Build.0 = Release|Win32
- {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Debug|Win32.ActiveCfg = Debug|Win32
- {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Debug|Win32.Build.0 = Debug|Win32
- {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Release|Win32.ActiveCfg = Release|Win32
- {7F599814-F7B1-4C4C-931C-04C05B0CA670}.Release|Win32.Build.0 = Release|Win32
- {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Debug|Win32.ActiveCfg = Debug|Win32
- {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Debug|Win32.Build.0 = Debug|Win32
- {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Release|Win32.ActiveCfg = Release|Win32
- {C151022B-EAC8-4680-9018-C0A897F7F9C6}.Release|Win32.Build.0 = Release|Win32
+ {8C4BC409-2EEC-41F5-A017-972F38414289}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8C4BC409-2EEC-41F5-A017-972F38414289}.Debug|Win32.Build.0 = Debug|Win32
+ {8C4BC409-2EEC-41F5-A017-972F38414289}.Release|Win32.ActiveCfg = Release|Win32
+ {8C4BC409-2EEC-41F5-A017-972F38414289}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: tools/trunk/dist/msvc9/compress_agos.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_agos.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_agos.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_agos.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_agos.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_gob.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_gob.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_gob.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/compress_gob.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_kyra.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_kyra.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_kyra.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -6,7 +6,7 @@
ProjectGUID="{B4D19F72-1F7B-48B2-8067-C6395B94DF05}"
RootNamespace="compress_kyra"
Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_kyra.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_kyra.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_queen.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_queen.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_queen.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_queen.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_queen.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_saga.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_saga.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_saga.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_saga.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_saga.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_scumm_bun.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_scumm_bun.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_scumm_bun.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_bun.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_bun.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_scumm_san.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_scumm_san.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_scumm_san.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib"
+ AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_san.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -96,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -119,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -136,11 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib"
+ AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_san.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_scumm_sou.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_scumm_sou.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_scumm_sou.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_sou.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_scumm_sou.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_sword1.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_sword1.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_sword1.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword1.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword1.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_sword2.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_sword2.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_sword2.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword2.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_sword2.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/compress_touche.vcproj
===================================================================
--- tools/trunk/dist/msvc9/compress_touche.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/compress_touche.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_touche.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
OutputFile="$(OutDir)/compress_touche.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/degob.vcproj
===================================================================
--- tools/trunk/dist/msvc9/degob.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/degob.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/degob.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/dekyra.vcproj
===================================================================
--- tools/trunk/dist/msvc9/dekyra.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/dekyra.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/dekyra.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/descumm.vcproj
===================================================================
--- tools/trunk/dist/msvc9/descumm.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/descumm.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/descumm.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/desword2.vcproj
===================================================================
--- tools/trunk/dist/msvc9/desword2.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/desword2.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/desword2.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/encode_dxa.vcproj
===================================================================
--- tools/trunk/dist/msvc9/encode_dxa.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/encode_dxa.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,9 +61,10 @@
/>
<Tool
Name="VCLinkerTool"
+ 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"
+ IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;libcmtd.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/encode_dxa.pdb"
SubSystem="1"
@@ -95,10 +96,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +120,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_BUILTIN_FLAC"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -135,10 +135,10 @@
/>
<Tool
Name="VCLinkerTool"
+ 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"
- GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_agos.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_agos.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_agos.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_agos.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_gob_stk.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_gob_stk.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_gob_stk.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_gob_stk.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_kyra.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_kyra.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_kyra.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_kyra.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -177,6 +175,10 @@
>
</File>
<File
+ RelativePath="..\..\kyra_ins.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\kyra_pak.cpp"
>
</File>
Modified: tools/trunk/dist/msvc9/extract_loom_tg16.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_loom_tg16.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_loom_tg16.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_loom_tg16.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_mm_apple.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_mm_apple.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_mm_apple.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_mm_apple.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_mm_c64.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_mm_c64.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_mm_c64.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_mm_c64.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_mm_nes.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_mm_nes.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_mm_nes.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE,SCUMMVM_USE_PRAGMA_PACK"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_mm_nes.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_parallaction.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_parallaction.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_parallaction.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/extract_parallaction.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="libc.lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: tools/trunk/dist/msvc9/extract_scumm_mac.vcproj
===================================================================
--- tools/trunk/dist/msvc9/extract_scumm_mac.vcproj 2009-05-16 11:18:14 UTC (rev 40622)
+++ tools/trunk/dist/msvc9/extract_scumm_mac.vcproj 2009-05-16 11:26:05 UTC (rev 40623)
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -95,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -118,11 +119,9 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4996"
- Optimization="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,8 +136,7 @@
Name="VCLinkerTool"
@@ Diff output truncated at 100000 characters. @@
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