Updated MSVC project files.

thanks to Bonzi.

git-svn-id: svn://svn.videolan.org/x264/trunk@218 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/build/win32/libx264.dsp b/build/win32/libx264.dsp
index 60b9abb4d4995136bb248651cf8648755ab99f7f..215861886c01ea9d9beb4ebb4fb3b33d6c8062ce 100644 (file)
--- a/build/win32/libx264.dsp
+++ b/build/win32/libx264.dsp
@@ -445,6 +445,68 @@ InputName=pixel-a
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE="..\..\common\i386\mc-a2.asm"\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Release\r
+InputPath=..\..\common\i386\mc-a2.asm\r
+InputName=mc-a2\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Debug\r
+InputPath=..\..\common\i386\mc-a2.asm\r
+InputName=mc-a2\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\..\common\i386\predict-a.asm"\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Release\r
+InputPath=..\..\common\i386\predict-a.asm\r
+InputName=predict-a\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Debug\r
+InputPath=..\..\common\i386\predict-a.asm\r
+InputName=predict-a\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\common\i386\pixel.h\r
 # End Source File\r
 # End Group\r
@@ -601,6 +663,21 @@ SOURCE=..\..\common\predict.c
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\common\i386\mc-c.c\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "obj/core_release"\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "obj/core_debug"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Dec"\r

diff --git a/common/common.h b/common/common.h
index 94d4574d3c45aff99804190f793b96811c51aa29..23404a808f966d47f4a5c60c6f30b6985f7a4121 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -33,6 +33,7 @@
 
 #ifdef _MSC_VER
 #define snprintf _snprintf
+#define X264_VERSION "" // no configure script for msvc
 #endif
 
 #include "x264.h"

diff --git a/encoder/set.c b/encoder/set.c
index c22c1b26de5c49a96a984999ae9bdbe4fcc8cae7..8406118db2efef3a39847c8b73f62412377b77fe 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -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 )
 {

diff --git a/vfw/config.c b/vfw/config.c
index 0e9a8cd09afe3d8aa6ad22e15e207734dd885480..4ebd083dcf95e363dfe87dc72fff82e7bc3a105c 100644 (file)
--- a/vfw/config.c
+++ b/vfw/config.c
@@ -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"

diff --git a/x264.c b/x264.c
index 80e6f5ebba824d2b1a2b34ae80ba9af5018adb1c..6268ecb2fb062eed99f4507aad04a216cd4eb635 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -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];