[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd build/vc2005/config.h build/vc2008/libcv...
|
From: |
Gerhard Reitmayr |
|
Subject: |
[libcvd-members] libcvd build/vc2005/config.h build/vc2008/libcv... |
|
Date: |
Sun, 12 Jul 2009 16:20:37 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Gerhard Reitmayr <gerhard> 09/07/12 16:20:37
Modified files:
build/vc2005 : config.h
build/vc2008 : libcvd.sln libcvd.vcproj
cvd_src/Win32 : glwindow.cpp win32.cpp
Log message:
some minor updates for Win32:
- globlist function implemented in native API
- glwindow will appear now when initialised
- incorporate linked libraries to make it easier for programs using
libcvd
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2005/config.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd.sln?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd.vcproj?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Win32/glwindow.cpp?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Win32/win32.cpp?cvsroot=libcvd&r1=1.1&r2=1.2
Patches:
Index: build/vc2005/config.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2005/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2005/config.h 12 Jun 2008 13:04:15 -0000 1.1
+++ build/vc2005/config.h 12 Jul 2009 16:20:36 -0000 1.2
@@ -7,15 +7,15 @@
#define CVD_HAVE_CPU_x86_64 1
#endif
#endif
-#if 0 // for now would like to find a solution
+
#ifndef CVD_DISABLE_GLOB
#define CVD_HAVE_GLOB 1
#endif
-#endif
#ifndef CVD_DISABLE_JPEG
#define CVD_HAVE_JPEG 1
#endif
+
#ifndef CVD_DISABLE_LAPACK
#define CVD_HAVE_LAPACK 1
#endif
Index: build/vc2008/libcvd.sln
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/libcvd.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/libcvd.sln 1 Apr 2009 16:54:27 -0000 1.1
+++ build/vc2008/libcvd.sln 12 Jul 2009 16:20:36 -0000 1.2
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcvd", "libcvd.vcproj",
"{DB1962D5-5EBB-499D-9F84-4FCF6435063C}"
EndProject
Global
Index: build/vc2008/libcvd.vcproj
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/libcvd.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/libcvd.vcproj 1 Apr 2009 16:54:27 -0000 1.1
+++ build/vc2008/libcvd.vcproj 12 Jul 2009 16:20:36 -0000 1.2
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="libcvd"
ProjectGUID="{DB1962D5-5EBB-499D-9F84-4FCF6435063C}"
RootNamespace="libcvd"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,14 +41,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include;..\..\..\jpeg-6b"
+
AdditionalIncludeDirectories="..\..;..\..\..;"..\..\..\Pre-built.2\include";"..\..\..\jpeg-7""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
DisableSpecificWarnings="4244"
/>
@@ -62,7 +62,10 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="pthreadVCE2.lib
jpeg.lib"
OutputFile="..\..\lib\$(ProjectName)d.lib"
+
AdditionalLibraryDirectories="../../../Pre-built.2/lib;../../../jpeg-7/Release"
/>
<Tool
Name="VCALinkTool"
@@ -107,12 +110,11 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
-
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include;..\..\..\jpeg-6b"
+
AdditionalIncludeDirectories="..\..;..\..\..;"..\..\..\Pre-built.2\include";"..\..\..\jpeg-7""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4244"
/>
@@ -127,7 +129,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="pthreadVCE2.lib
jpeg.lib"
OutputFile="..\..\lib\$(ProjectName).lib"
+
AdditionalLibraryDirectories="../../../Pre-built.2/lib;../../../jpeg-7/Release"
/>
<Tool
Name="VCALinkTool"
@@ -557,14 +561,14 @@
>
</File>
<File
- RelativePath=".\config.h"
+ RelativePath="..\vc2005\config.h"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="copy
..\vc2005\$(InputFileName) ..\..\cvd\
"
+ CommandLine="copy $(InputPath)
..\..\cvd
"
Outputs="..\..\cvd\$(InputFileName)"
/>
</FileConfiguration>
@@ -573,7 +577,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="copy
$(InputFileName) ..\..\cvd\
"
+ CommandLine="copy $(InputPath)
..\..\cvd
"
Outputs="..\..\cvd\$(InputFileName)"
/>
</FileConfiguration>
Index: cvd_src/Win32/glwindow.cpp
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Win32/glwindow.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cvd_src/Win32/glwindow.cpp 13 May 2009 11:10:11 -0000 1.4
+++ cvd_src/Win32/glwindow.cpp 12 Jul 2009 16:20:37 -0000 1.5
@@ -206,6 +206,10 @@
state->position_offset.y = WindowRect.top - oldRect.top;
state->position = -state->position_offset;
+
+ // handle events to make window appear
+ EventSummary summary;
+ get_events(summary);
}
GLWindow::~GLWindow()
Index: cvd_src/Win32/win32.cpp
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Win32/win32.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd_src/Win32/win32.cpp 12 Jun 2008 13:04:16 -0000 1.1
+++ cvd_src/Win32/win32.cpp 12 Jul 2009 16:20:37 -0000 1.2
@@ -1,6 +1,9 @@
#include "win32.h"
#include <time.h>
+#include <string>
+#include <vector>
+#include <io.h>
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
@@ -58,4 +61,22 @@
} // namespace Internal
+// simple implementation of globlist after MSDN example for _findfirst
+std::vector<std::string> globlist(const std::string& gl)
+{
+ std::vector<std::string> ret;
+
+ struct _finddatai64_t c_file;
+ intptr_t hFile;
+
+ // Find first file in current directory
+ if( (hFile = _findfirsti64( gl.c_str(), &c_file )) != -1L ){
+ do {
+ ret.push_back(c_file.name);
+ } while( _findnexti64( hFile, &c_file ) == 0 );
+ _findclose( hFile );
+ }
+ return ret;
+}
+
} // namespace CVD
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd build/vc2005/config.h build/vc2008/libcv...,
Gerhard Reitmayr <=