NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Davis King 2015-01-29 20:42:05 -05:00
commit 11983d7291
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlib/CMakeLists.txt
View File

@ -136,9 +136,9 @@ if (NOT TARGET dlib)
# we want to link to the right stuff depending on our platform.
if (WIN32 AND NOT CYGWIN) ###############################################################################
if (DLIB_NO_GUI_SUPPORT)
set (dlib_needed_libraries ws2_32)
set (dlib_needed_libraries ws2_32 winmm)
else()
set (dlib_needed_libraries ws2_32 comctl32 gdi32 imm32)
set (dlib_needed_libraries ws2_32 winmm comctl32 gdi32 imm32)
endif()
elseif(APPLE) ############################################################################
find_library(pthreadlib pthread)

7
dlib/misc_api/misc_api_kernel_1.cpp
View File

@ -13,6 +13,11 @@
#include "../windows_magic.h"
#include <windows.h>
// tell visual studio to link to the library needed to call timeGetTime()
#ifdef _MSC_VER
#pragma comment (lib, "winmm.lib")
#endif
#ifdef __BORLANDC__
// Apparently the borland compiler doesn't define this.
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
@ -89,7 +94,7 @@ namespace dlib
get_timestamp (
) const
{
unsigned long temp = GetTickCount();
unsigned long temp = timeGetTime();
if (temp >= last_time)
{
last_time = temp;

12
dlib/sqlite/sqlite.h
View File

@ -383,7 +383,7 @@ namespace dlib
template <typename T>
typename enable_if_c<std::numeric_limits<T>::is_integer>::type bind (
unsigned long idx,
T& item
const T& item
)
{
if (sizeof(T) <= 4)
@ -392,15 +392,15 @@ namespace dlib
bind_int64(idx, item);
}
void bind(unsigned long idx, std::string& item) { bind_text(idx, item); }
void bind(unsigned long idx, float& item ) { bind_double(idx, item); }
void bind(unsigned long idx, double& item ) { bind_double(idx, item); }
void bind(unsigned long idx, long double& item) { bind_double(idx, item); }
void bind(unsigned long idx, const std::string& item) { bind_text(idx, item); }
void bind(unsigned long idx, const float& item ) { bind_double(idx, item); }
void bind(unsigned long idx, const double& item ) { bind_double(idx, item); }
void bind(unsigned long idx, const long double& item) { bind_double(idx, item); }
template <typename T>
typename disable_if_c<std::numeric_limits<T>::is_integer>::type bind (
unsigned long idx,
T& item
const T& item
)
{
bind_object(idx, item);

2
dlib/sqlite/sqlite_abstract.h
View File

@ -379,7 +379,7 @@ namespace dlib
>
void bind (
unsigned long parameter_id,
T& item
const T& item
) const;
/*!
requires

2
docs/docs/compile.xml
View File

@ -97,7 +97,7 @@ sudo apt-get install libx11-dev
<h2>Compiling on Windows Using GCC</h2>
<p>
The commands for gcc on windows are the same as above but you may also have to link
(via the -l option) to the following libraries: gdi32, comctl32, user32, ws2_32, or imm32.
(via the -l option) to the following libraries: gdi32, comctl32, user32, winmm, ws2_32, or imm32.
However, it's worth pointing out that Visual Studio Express is free and a much better choice for
windows development than gcc.
</p>