Fix some warnings in MSVC (no more deprecated warnings again), fixed g729 build in msvc broken when the files in the lib moved when it was autotooled. Add details in readme about msvc requirements when using VC++ express 2005.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@303 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
parent
e78d668234
commit
c028235080
8
README
8
README
|
|
@ -30,3 +30,11 @@ jrtplib: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib-3.3.0.tar.gz
|
|||
Backup Download Locations:
|
||||
jthread: http://www.sofaswitch.org/mikej/jthread-1.1.2.tar.gz
|
||||
jrtplib: http://www.sofaswitch.org/mikej/jrtplib-3.3.0.tar.gz
|
||||
|
||||
MSVC Notes:
|
||||
Freeswitch will compile and run from Microsoft Visual Studio 2005.
|
||||
If using the Visual C++ Express edition, please make sure that the location of the include and lib directories are propperly set in the file
|
||||
C:\Program Files\Microsoft Visual Studio 8\VC\vcpackages\VCProjectEngine.Dll.Express.Config.
|
||||
The automated build process for te dependecy libraries will not work without these settings.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -43,10 +43,12 @@ extern "C" {
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
//Need to include this before any other includes (MSVC Bug)
|
||||
#include <switch_platform.h>
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include <switch_version.h>
|
||||
#include <switch_platform.h>
|
||||
#include <switch_apr.h>
|
||||
#include <switch_sqlite.h>
|
||||
#include <switch_types.h>
|
||||
|
|
|
|||
|
|
@ -398,11 +398,83 @@ DoxyDefine(const char *switch_core_db_column_decltype(sqlite3_stmt *, int i);)
|
|||
DoxyDefine(const void *switch_core_db_column_decltype16(sqlite3_stmt*,int);)
|
||||
#define switch_core_db_column_decltype16 sqlite3_column_decltype16
|
||||
|
||||
/**
|
||||
** Register a callback function to be invoked whenever a new transaction
|
||||
** is committed. The pArg argument is passed through to the callback.
|
||||
** callback. If the callback function returns non-zero, then the commit
|
||||
** is converted into a rollback.
|
||||
**
|
||||
** If another function was previously registered, its pArg value is returned.
|
||||
** Otherwise NULL is returned.
|
||||
**
|
||||
** Registering a NULL function disables the callback.
|
||||
**
|
||||
******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
|
||||
*/
|
||||
DoxyDefine(void *switch_core_db_commit_hook(switch_core_db*, int(*)(void*), void*);)
|
||||
#define switch_core_db_commit_hook sqlite3_commit_hook
|
||||
|
||||
/**
|
||||
** These functions return true if the given input string comprises
|
||||
** one or more complete SQL statements. For the sqlite3_complete() call,
|
||||
** the parameter must be a nul-terminated UTF-8 string. For
|
||||
** sqlite3_complete16(), a nul-terminated machine byte order UTF-16 string
|
||||
** is required.
|
||||
**
|
||||
** The algorithm is simple. If the last token other than spaces
|
||||
** and comments is a semicolon, then return true. otherwise return
|
||||
** false.
|
||||
*/
|
||||
DoxyDefine(int switch_core_db_complete(const char *sql);)
|
||||
DoxyDefine(int switch_core_db_complete16(const void *sql);)
|
||||
#define switch_core_db_complete sqlite3_complete
|
||||
#define switch_core_db_complete16 sqlite3_complete16
|
||||
|
||||
/**
|
||||
** These two functions are used to add new collation sequences to the
|
||||
** sqlite3 handle specified as the first argument.
|
||||
**
|
||||
** The name of the new collation sequence is specified as a UTF-8 string
|
||||
** for sqlite3_create_collation() and a UTF-16 string for
|
||||
** sqlite3_create_collation16(). In both cases the name is passed as the
|
||||
** second function argument.
|
||||
**
|
||||
** The third argument must be one of the constants SQLITE_UTF8,
|
||||
** SQLITE_UTF16LE or SQLITE_UTF16BE, indicating that the user-supplied
|
||||
** routine expects to be passed pointers to strings encoded using UTF-8,
|
||||
** UTF-16 little-endian or UTF-16 big-endian respectively.
|
||||
**
|
||||
** A pointer to the user supplied routine must be passed as the fifth
|
||||
** argument. If it is NULL, this is the same as deleting the collation
|
||||
** sequence (so that SQLite cannot call it anymore). Each time the user
|
||||
** supplied function is invoked, it is passed a copy of the void* passed as
|
||||
** the fourth argument to sqlite3_create_collation() or
|
||||
** sqlite3_create_collation16() as its first parameter.
|
||||
**
|
||||
** The remaining arguments to the user-supplied routine are two strings,
|
||||
** each represented by a [length, data] pair and encoded in the encoding
|
||||
** that was passed as the third argument when the collation sequence was
|
||||
** registered. The user routine should return negative, zero or positive if
|
||||
** the first string is less than, equal to, or greater than the second
|
||||
** string. i.e. (STRING1 - STRING2).
|
||||
*/
|
||||
DoxyDefine(int switch_core_db_create_collation(
|
||||
switch_core_db*,
|
||||
const char *zName,
|
||||
int eTextRep,
|
||||
void*,
|
||||
int(*xCompare)(void*,int,const void*,int,const void*)
|
||||
);)
|
||||
DoxyDefine(int switch_core_db_create_collation16(
|
||||
switch_core_db*,
|
||||
const char *zName,
|
||||
int eTextRep,
|
||||
void*,
|
||||
int(*xCompare)(void*,int,const void*,int,const void*)
|
||||
);)
|
||||
#define switch_core_db_create_collation sqlite3_create_collation
|
||||
#define switch_core_db_create_collation16 sqlite3_create_collation16
|
||||
|
||||
#define switch_core_db_create_function sqlite3_create_function
|
||||
#define switch_core_db_create_function16 sqlite3_create_function16
|
||||
#define switch_core_db_data_count sqlite3_data_count
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729""
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729\src\include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729""
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729\src\include""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
|
|||
Loading…
Reference in New Issue