updated MS VC8/VC7 build, patch by Gabriel Bouvigne
authorAlex Izvorski <aizvorski@gmail.com>
Tue, 5 Jun 2007 18:32:13 +0000 (18:32 +0000)
committerAlex Izvorski <aizvorski@gmail.com>
Tue, 5 Jun 2007 18:32:13 +0000 (18:32 +0000)
git-svn-id: svn://svn.videolan.org/x264/trunk@657 df754926-b1dd-0310-bc7b-ec298dee348c

build/win32/libx264.vcproj
common/frame.c
encoder/analyse.c
extras/getopt.c

index dd57e52..404ea6e 100644 (file)
                                        </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
                                <File\r
index e5a1b91..a852c91 100644 (file)
@@ -23,7 +23,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "common.h"
 
index e2ddf30..6dfca9b 100644 (file)
@@ -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"
index 9fb69b1..37c5d21 100644 (file)
@@ -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