Commit ab2cdf4b authored by Loren Merritt's avatar Loren Merritt

Updated MSVC project files.

thanks to Bonzi.


git-svn-id: svn://svn.videolan.org/x264/trunk@218 df754926-b1dd-0310-bc7b-ec298dee348c
parent e0a64041
......@@ -445,6 +445,68 @@ InputName=pixel-a
# End Source File
# Begin Source File
SOURCE="..\..\common\i386\mc-a2.asm"
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\common\i386\mc-a2.asm
InputName=mc-a2
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\common\i386\mc-a2.asm
InputName=mc-a2
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE="..\..\common\i386\predict-a.asm"
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\common\i386\predict-a.asm
InputName=predict-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\common\i386\predict-a.asm
InputName=predict-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\common\i386\pixel.h
# End Source File
# End Group
......@@ -601,6 +663,21 @@ SOURCE=..\..\common\predict.c
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\common\i386\mc-c.c
!IF "$(CFG)" == "libx264 - Win32 Release"
# PROP Intermediate_Dir "obj/core_release"
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# PROP Intermediate_Dir "obj/core_debug"
!ENDIF
# End Source File
# End Group
# Begin Group "Dec"
......
......@@ -33,6 +33,7 @@
#ifdef _MSC_VER
#define snprintf _snprintf
#define X264_VERSION "" // no configure script for msvc
#endif
#include "x264.h"
......
......@@ -33,8 +33,10 @@
#include <math.h>
#include "x264.h"
#include "config.h"
#include "common/common.h"
#ifndef _MSC_VER
#include "config.h"
#endif
void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param )
{
......
......@@ -31,10 +31,15 @@
**************************************************************************/
#include "x264vfw.h"
#include "config.h"
#include <stdio.h> /* sprintf */
#include <commctrl.h>
#ifdef _MSC_VER
#define X264_VERSION ""
#else
#include "config.h"
#endif
/* Registry */
#define X264_REG_KEY HKEY_CURRENT_USER
#define X264_REG_PARENT "Software\\GNU"
......
......@@ -46,8 +46,10 @@
#endif
#include "common/common.h"
#include "config.h"
#include "x264.h"
#ifndef _MSC_VER
#include "config.h"
#endif
#define DATA_MAX 3000000
uint8_t data[DATA_MAX];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment