updated MS VC8/VC7 build, patch by Gabriel Bouvigne

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

diff --git a/build/win32/libx264.vcproj b/build/win32/libx264.vcproj
index dd57e52c2d69bd0f145da50467b5279a99b0d119..404ea6e408aefa5a70a6eac471b99967467a9065 100644 (file)
--- a/build/win32/libx264.vcproj
+++ b/build/win32/libx264.vcproj
@@ -1055,34 +1055,6 @@
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
                                </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\i386\dct-c.c">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       Optimization="2"\r
-                                                       AdditionalIncludeDirectories=""\r
-                                                       PreprocessorDefinitions=""/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       Optimization="0"\r
-                                                       AdditionalIncludeDirectories=""\r
-                                                       PreprocessorDefinitions=""\r
-                                                       BasicRuntimeChecks="3"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       Optimization="2"\r
-                                                       AdditionalIncludeDirectories=""\r
-                                                       PreprocessorDefinitions=""/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\common\i386\dct.h">\r
                                </File>\r

diff --git a/common/frame.c b/common/frame.c
index e5a1b911e3571c7f45111aa08ea395f22738fd51..a852c911df737d104f9a7e26bedf5d4bdfa1e4c8 100644 (file)
--- a/common/frame.c
+++ b/common/frame.c
@@ -23,7 +23,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "common.h"
 

diff --git a/encoder/analyse.c b/encoder/analyse.c
index e2ddf30f333ae285febbe5325da179f59a6417b7..6dfca9bf00c835d3aaa6f21a456f8848bbb39463 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -26,7 +26,9 @@
 #include <string.h>
 #include <math.h>
 #include <limits.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "common/common.h"
 #include "macroblock.h"

diff --git a/extras/getopt.c b/extras/getopt.c
index 9fb69b1afc3f5893c018c57ba4c01d05cc417272..37c5d21a58c6881c6f20af31db8f3cc2b99578ee 100644 (file)
--- a/extras/getopt.c
+++ b/extras/getopt.c
@@ -202,7 +202,11 @@ static char *posixly_correct;
 # if HAVE_STRING_H
 #  include <string.h>
 # else
-#  include <strings.h>
+#  ifdef _MSC_VER
+#   include <string.h>
+#  else
+#   include <strings.h>
+#  endif
 # endif
 
 /* Avoid depending on library functions or files
@@ -980,6 +984,16 @@ getopt (argc, argv, optstring)
                           0);
 }
 
+#ifdef _MSC_VER
+
+int
+getopt_long (argc, argv, optstring, long_options, opt_index)
+{
+  return _getopt_internal (argc, argv, optstring, long_options, opt_index, 0);
+}
+
+#endif
+
 #endif /* Not ELIDE_CODE.  */
 \f
 #ifdef TEST