[libcvd-members] libcvd build/vc2008/libcvd.sln build/vc2008/lib...

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      10/04/29 16:07:17

Modified files:
        build/vc2008   : libcvd.sln libcvd.vcproj 
        pnm_src        : cvdimage.cxx 

Log message:
        fix for Win32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd.sln?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd.vcproj?cvsroot=libcvd&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/cvdimage.cxx?cvsroot=libcvd&r1=1.5&r2=1.6

Patches:
Index: build/vc2008/libcvd.sln
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/libcvd.sln,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- build/vc2008/libcvd.sln     5 Aug 2009 14:59:09 -0000       1.3
+++ build/vc2008/libcvd.sln     29 Apr 2010 16:07:17 -0000      1.4
@@ -4,9 +4,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcvd", "libcvd.vcproj", 
"{DB1962D5-5EBB-499D-9F84-4FCF6435063C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", 
"install.vcproj", "{78ED5E94-8383-418F-876D-8FB7AFD2E7BF}"
-       ProjectSection(ProjectDependencies) = postProject
-               {DB1962D5-5EBB-499D-9F84-4FCF6435063C} = 
{DB1962D5-5EBB-499D-9F84-4FCF6435063C}
-       EndProjectSection
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

Index: build/vc2008/libcvd.vcproj
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/libcvd.vcproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- build/vc2008/libcvd.vcproj  16 Dec 2009 15:18:51 -0000      1.6
+++ build/vc2008/libcvd.vcproj  29 Apr 2010 16:07:17 -0000      1.7
@@ -22,7 +22,7 @@
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="4"
                        CharacterSet="0"
-                       WholeProgramOptimization="1"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -48,6 +48,7 @@
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
+                               EnableEnhancedInstructionSet="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="4"
@@ -64,7 +65,7 @@
                        />
                        <Tool
                                Name="VCLibrarianTool"
-                               AdditionalDependencies="pthreadVCE2.lib 
jpeg.lib"
+                               AdditionalDependencies="pthreadVCE2.lib 
jpeg.lib Ws2_32.lib"
                                OutputFile="..\..\lib\$(ProjectName)d.lib"
                                
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
                        />
@@ -90,7 +91,7 @@
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="4"
                        CharacterSet="0"
-                       WholeProgramOptimization="1"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -111,6 +112,7 @@
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="2"
                                FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
                                
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="2"
@@ -131,7 +133,7 @@
                        />
                        <Tool
                                Name="VCLibrarianTool"
-                               AdditionalDependencies="pthreadVCE2.lib 
jpeg.lib"
+                               AdditionalDependencies="pthreadVCE2.lib 
jpeg.lib Ws2_32.lib"
                                OutputFile="..\..\lib\$(ProjectName).lib"
                                
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
                        />
@@ -474,6 +476,10 @@
                                        >
                                </File>
                                <File
+                                       
RelativePath="..\..\pnm_src\cvdimage.cxx"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\..\pnm_src\fits.cc"
                                        >
                                </File>

Index: pnm_src/cvdimage.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/cvdimage.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pnm_src/cvdimage.cxx        21 Mar 2010 19:02:03 -0000      1.5
+++ pnm_src/cvdimage.cxx        29 Apr 2010 16:07:17 -0000      1.6
@@ -20,9 +20,7 @@
 */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
-#include <arpa/inet.h> // used for byte reordering
 #include "cvd/internal/io/cvdimage.h"
 
 #include "cvd/image_io.h"
@@ -34,7 +32,18 @@
 #include <algorithm>
 #include <set>
 #include <climits>
+
+#ifdef WIN32
+#include <array>
+#include <Winsock2.h>
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int64  uint64_t;
+#else
 #include <tr1/array>
+#include <arpa/inet.h> // used for byte reordering
+#include <stdint.h>
+#endif
+
 using namespace std;
 using namespace std::tr1;