aboutsummaryrefslogtreecommitdiff
path: root/dists
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-05-21 17:06:18 +0000
committerPaweł Kołodziejski2004-05-21 17:06:18 +0000
commit04f8cac775e8c380dd9fb76b473a77f1bfda0452 (patch)
tree1dd311323b82d32bb2a991babb775eef434410af /dists
parentd33b24036e7a0753a6de8a416c5c649f7ba84180 (diff)
downloadscummvm-rg350-04f8cac775e8c380dd9fb76b473a77f1bfda0452.tar.gz
scummvm-rg350-04f8cac775e8c380dd9fb76b473a77f1bfda0452.tar.bz2
scummvm-rg350-04f8cac775e8c380dd9fb76b473a77f1bfda0452.zip
update
svn-id: r13845
Diffstat (limited to 'dists')
-rw-r--r--dists/msvc7/scummvm.vcproj42
1 files changed, 40 insertions, 2 deletions
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index afba740eb2..cf9fb92f40 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -21,7 +21,7 @@
AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
Optimization="0"
AdditionalIncludeDirectories="../../;../../common"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;DISABLE_SAGA"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;DISABLE_SAGA"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -76,7 +76,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../../;../../common"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;DISABLE_SAGA"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;DISABLE_SAGA"
StringPooling="TRUE"
MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
@@ -254,12 +254,50 @@
RelativePath="..\..\common\scaler\hq2x.h">
</File>
<File
+ RelativePath="..\..\common\scaler\hq2x_i386.asm">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
+"
+ Outputs="$(OutDir)\$(InputName).obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
+"
+ Outputs="$(OutDir)\$(InputName).obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\common\scaler\hq3x.cpp">
</File>
<File
RelativePath="..\..\common\scaler\hq3x.h">
</File>
<File
+ RelativePath="..\..\common\scaler\hq3x_i386.asm">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
+"
+ Outputs="$(OutDir)\$(InputName).obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
+"
+ Outputs="$(OutDir)\$(InputName).obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\common\scaler\intern.h">
</File>
</Filter>