[PATCH] fixes MSVC:=0A= adds cabac-a.asm to libx264.vcproj=0A= adds fix to MSVC bug for logf=0A=
David Lariviere
dal2103 at columbia.edu
Mon Mar 31 09:21:02 CEST 2008
=0A=
Signed-off-by: David Lariviere <dal2103 at columbia.edu>=0A=
---=0A=
build/win32/libx264.vcproj | 169 =
+++++++++++++++++++++++++++++---------------=0A=
common/osdep.h | 11 +++=0A=
2 files changed, 122 insertions(+), 58 deletions(-)=0A=
=0A=
diff --git a/build/win32/libx264.vcproj b/build/win32/libx264.vcproj=0A=
index bc0558b..b846b97 100644=0A=
--- a/build/win32/libx264.vcproj=0A=
+++ b/build/win32/libx264.vcproj=0A=
@@ -843,7 +843,7 @@=0A=
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\predict.c">
+ RelativePath=3D"..\..\common\x86\predict-c.c">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
@@ -877,7 +877,7 @@=0A=
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\predict-c.c">
+ RelativePath=3D"..\..\common\predict.c">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
@@ -963,13 +963,24 @@=0A=
Name=3D"x86"
Filter=3D"*.h,*.c,*-a.asm">
<File
+ RelativePath=3D"..\..\common\x86\cabac-a.asm">
+ <FileConfiguration
+ Name=3D"Debug|Win32">
+ <Tool
+ Name=3D"VCCustomBuildTool"
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ Outputs=3D"$(IntDir)\$(InputName).obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=3D"..\..\common\x86\cpu-32.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -977,7 +988,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -986,7 +998,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -997,7 +1010,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1005,7 +1019,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1014,7 +1029,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -1025,7 +1041,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1033,7 +1050,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1042,7 +1060,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -1056,7 +1075,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1064,7 +1084,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1072,18 +1093,20 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\x86inc.asm">
+ RelativePath=3D"..\..\common\x86\mc-a.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1091,26 +1114,30 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
- Name=3D"Release64|Win32">
+ Name=3D"Release64|Win32"
+ ExcludedFromBuild=3D"TRUE">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\mc-a.asm">
+ RelativePath=3D"..\..\common\x86\mc-a2.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1118,7 +1145,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1127,18 +1155,20 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\mc-a2.asm">
+ RelativePath=3D"..\..\common\x86\pixel-32.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1146,7 +1176,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1155,7 +1186,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -1166,7 +1198,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1174,7 +1207,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1183,18 +1217,23 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\pixel-32.asm">
+ RelativePath=3D"..\..\common\x86\pixel.h">
+ </File>
+ <File
+ RelativePath=3D"..\..\common\x86\predict-a.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1202,7 +1241,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1211,21 +1251,20 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\pixel.h">
- </File>
- <File
- RelativePath=3D"..\..\common\x86\predict-a.asm">
+ RelativePath=3D"..\..\common\x86\quant-a.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1233,7 +1272,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1242,18 +1282,20 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\quant-a.asm">
+ RelativePath=3D"..\..\common\x86\sad-a.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1261,7 +1303,8 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1270,18 +1313,20 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
- RelativePath=3D"..\..\common\x86\sad-a.asm">
+ RelativePath=3D"..\..\common\x86\x86inc.asm">
<FileConfiguration
Name=3D"Release|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -1289,16 +1334,17 @@=0A=
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
- Name=3D"Release64|Win32"
- ExcludedFromBuild=3D"TRUE">
+ Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
Description=3D"Assembly $(InputPath)"
- CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D"$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -1327,7 +1373,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
@@ -1349,7 +1396,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
@@ -1371,7 +1419,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
@@ -1393,7 +1442,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
@@ -1415,7 +1465,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
@@ -1437,7 +1488,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
@@ -1459,7 +1511,8 @@=0A=
Name=3D"Release64|Win32">
<Tool
Name=3D"VCCustomBuildTool"
- CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)""
+ CommandLine=3D"yasm -f win32 -O2 -m AMD64 -DWIN64 -o =
"$(IntDir)\$(InputName)".obj "$(InputPath)"
+"
Outputs=3D""$(IntDir)\$(InputName)".obj"/>
</FileConfiguration>
</File>
diff --git a/common/osdep.h b/common/osdep.h=0A=
index 7606d66..0ccbb6c 100644=0A=
--- a/common/osdep.h=0A=
+++ b/common/osdep.h=0A=
@@ -31,6 +31,17 @@=0A=
#include <inttypes.h>=0A=
#endif=0A=
=0A=
+//fixes logf bug in MSVC's math.h=0A=
+//see =
http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?Feed=
backID=3D98751=0A=
+//note this will only work if math.h is included after osdep.h=0A=
+#ifdef _MSC_VER=0A=
+#if !defined (_M_IA64) && !defined (_M_AMD64)
+#undef logf
+#define logf(x) ((float)log((double)(x)))
+#endif // !defined (_M_IA64) && !defined (_M_AMD64)=0A=
+#endif =0A=
+=0A=
+=0A=
#ifdef _MSC_VER=0A=
#include <io.h> // _setmode()=0A=
#include <fcntl.h> // _O_BINARY=0A=
-- =0A=
1.5.4.950.ga176=0A=
=0A=
------=_NextPart_000_0090_01C89311.D92EA8E0--
More information about the x264-devel
mailing list