Changeset 4100 for zzuf/trunk/msvcTweet

Timestamp:

Dec 7, 2009, 1:36:15 PM (11 years ago)

Author:

Sam Hocevar

Message:

Synchronise Win32 port with recent config.h changes.

Location:

zzuf/trunk/msvc

Files:

• config.h (modified) (4 diffs)
• libzzuf.vcxproj (modified) (2 diffs)
• zzuf.sln (modified) (1 diff)

zzuf/trunk/msvc/config.h

@@ -41 +41 @@
 /* #undef HAVE_FREOPEN64 */
 /* #undef HAVE_FSEEKO */
-#define HAVE_FSEEKO64 1
+/* #undef HAVE_FSEEKO64 */
 /* #undef HAVE_FSETPOS64 */
 /* #undef HAVE_FTELLO */
-#define HAVE_FTELLO64 1
+/* #undef HAVE_FTELLO64 */
 /* #undef HAVE_GETCHAR_UNLOCKED */
 /* #undef HAVE_GETC_UNLOCKED */
 /* #undef HAVE_GETDELIM */
 /* #undef HAVE_GETLINE */
-#define HAVE_GETOPT_H 1
-#define HAVE_GETOPT_LONG 1
+/* #undef HAVE_GETOPT_H */
+/* #undef HAVE_GETOPT_LONG */
 #define HAVE_GETPAGESIZE 1
-#define HAVE_GETTIMEOFDAY 1
+/* #undef HAVE_GETTIMEOFDAY */
 /* #undef HAVE_GLIBC_FP */
 #define HAVE_INTTYPES_H 1
@@ -58 +58 @@
 /* #undef HAVE_KILL */
 /* #undef HAVE_LIBC_H */
-#define HAVE_LSEEK64 1
+/* #undef HAVE_LSEEK64 */
 #define HAVE_MALLOC_H 1
 /* #undef HAVE_MAP_FD */
@@ -93 +93 @@
 /* #undef HAVE_SYS_SOCKET_H */
 #define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIME_H 1
+/* #undef HAVE_SYS_TIME_H */
 #define HAVE_SYS_TYPES_H 1
 /* #undef HAVE_SYS_UIO_H */
 /* #undef HAVE_SYS_WAIT_H */
-#define HAVE_UNISTD_H 1
+/* #undef HAVE_UNISTD_H */
 /* #undef HAVE_VALLOC */
 /* #undef HAVE_WAITPID */
@@ -130 +130 @@
 /* #undef __func__ */
 
+/* Fucking Visual Studio should just shut the fuck up with this fucking
+ * warning about fucking ISO C++ when we fucking compile fucking C. */
+#pragma warning(disable: 4996)
+
 /* Win32-specific, of course. */
 typedef signed long long int int64_t;

zzuf/trunk/msvc/libzzuf.vcxproj

@@ -63 +63 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -88 +88 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>

zzuf/trunk/msvc/zzuf.sln

@@ -1 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzuf", "zzuf.vcproj", "{2E5723ED-A886-45A9-AAAC-3D02F2EFC358}"
-        ProjectSection(ProjectDependencies) = postProject
-        EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzuf", "zzuf.vcxproj", "{2E5723ED-A886-45A9-AAAC-3D02F2EFC358}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzzuf", "libzzuf.vcproj", "{E658DCE5-E1E5-41C8-910B-1CC2D73C435C}"
-        ProjectSection(ProjectDependencies) = postProject
-        EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzzuf", "libzzuf.vcxproj", "{E658DCE5-E1E5-41C8-910B-1CC2D73C435C}"
 EndProject
 Global
-        GlobalSection(SolutionConfiguration) = preSolution
-                Debug = Debug
-                Release = Release
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Win32 = Debug|Win32
+                Release|Win32 = Release|Win32
         EndGlobalSection
-        GlobalSection(ProjectConfiguration) = postSolution
-                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug.ActiveCfg = Debug|Win32
-                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug.Build.0 = Debug|Win32
-                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release.ActiveCfg = Release|Win32
-                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release.Build.0 = Release|Win32
-                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug.ActiveCfg = Debug|Win32
-                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug.Build.0 = Debug|Win32
-                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release.ActiveCfg = Release|Win32
-                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release.Build.0 = Release|Win32
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug|Win32.ActiveCfg = Debug|Win32
+                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug|Win32.Build.0 = Debug|Win32
+                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release|Win32.ActiveCfg = Release|Win32
+                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release|Win32.Build.0 = Release|Win32
+                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug|Win32.ActiveCfg = Debug|Win32
+                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug|Win32.Build.0 = Debug|Win32
+                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release|Win32.ActiveCfg = Release|Win32
+                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-        EndGlobalSection
-        GlobalSection(ExtensibilityAddIns) = postSolution
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
         EndGlobalSection
 EndGlobal