mirror of
https://github.com/pocoproject/poco.git
synced 2025-01-30 05:39:03 +01:00
Merge pull request #903 from zosrothko/develop
Various fixes for Cygwin X86_64 port and additional minor fixes
This commit is contained in:
commit
23f8842a14
@ -53,5 +53,6 @@ Jonathan Seeley
|
||||
Tor Lillqvist
|
||||
Alexander Bychuk
|
||||
Francisco Ramírez
|
||||
Francis André
|
||||
--
|
||||
$Id$
|
||||
|
@ -12,7 +12,7 @@ COMMONFLAGS += -I$(POCO_BASE)/Data/SQLite/src
|
||||
|
||||
SYSFLAGS += -DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS \
|
||||
-DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE \
|
||||
-DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED
|
||||
-DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OS_UNIX
|
||||
|
||||
objects = Binder Extractor Notifier SessionImpl Connector \
|
||||
SQLiteException SQLiteStatementImpl Utility
|
||||
|
@ -96,6 +96,10 @@ extern "C" \
|
||||
pManifest->insert(new Poco::MetaObject<cls, _Base>(#cls));
|
||||
|
||||
|
||||
#define POCO_EXPORT_INTERFACE(cls, itf) \
|
||||
pManifest->insert(new Poco::MetaObject<cls, _Base>(itf));
|
||||
|
||||
|
||||
#define POCO_EXPORT_SINGLETON(cls) \
|
||||
pManifest->insert(new Poco::MetaSingleton<cls, _Base>(#cls));
|
||||
|
||||
|
@ -128,7 +128,7 @@ public:
|
||||
long getTid() const;
|
||||
/// Returns the numeric thread identifier for the message.
|
||||
|
||||
long getOsTid() const;
|
||||
IntPtr getOsTid() const;
|
||||
/// Returns the numeric OS thread identifier for the message.
|
||||
|
||||
void setPid(long pid);
|
||||
@ -199,7 +199,7 @@ private:
|
||||
Priority _prio;
|
||||
Timestamp _time;
|
||||
int _tid;
|
||||
int _ostid;
|
||||
IntPtr _ostid;
|
||||
std::string _thread;
|
||||
long _pid;
|
||||
const char* _file;
|
||||
@ -247,7 +247,7 @@ inline long Message::getTid() const
|
||||
}
|
||||
|
||||
|
||||
inline long Message::getOsTid() const
|
||||
inline IntPtr Message::getOsTid() const
|
||||
{
|
||||
return _ostid;
|
||||
}
|
||||
|
@ -118,7 +118,7 @@ void Message::init()
|
||||
#if !defined(POCO_VXWORKS)
|
||||
_pid = Process::id();
|
||||
#endif
|
||||
_ostid = Thread::currentTid();
|
||||
_ostid = (IntPtr)Thread::currentTid();
|
||||
Thread* pThread = Thread::current();
|
||||
if (pThread)
|
||||
{
|
||||
|
@ -41,13 +41,13 @@ SHAREDLIBLINKEXT = .dll
|
||||
#
|
||||
CFLAGS =
|
||||
CFLAGS32 =
|
||||
CFLAGS64 =
|
||||
CXXFLAGS = -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SHAREDMEMORY
|
||||
CFLAGS64 =
|
||||
CXXFLAGS = -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SHAREDMEMORY -Wa,-mbig-obj
|
||||
CXXFLAGS32 =
|
||||
CXXFLAGS64 =
|
||||
CXXFLAGS64 =
|
||||
LINKFLAGS =
|
||||
LINKFLAGS32 =
|
||||
LINKFLAGS64 =
|
||||
LINKFLAGS64 =
|
||||
STATICOPT_CC =
|
||||
STATICOPT_CXX =
|
||||
STATICOPT_LINK = -static
|
||||
@ -64,7 +64,7 @@ RELEASEOPT_LINK =
|
||||
#
|
||||
# System Specific Flags
|
||||
#
|
||||
SYSFLAGS = -D_XOPEN_SOURCE=500
|
||||
SYSFLAGS = -D_XOPEN_SOURCE=500 -D__BSD_VISIBLE
|
||||
|
||||
#
|
||||
# System Specific Libraries
|
||||
|
@ -18,6 +18,14 @@ components=`cat $POCO_BASE/components`
|
||||
|
||||
if [ "$OSNAME" = "" ] ; then
|
||||
OSNAME=`uname`
|
||||
case $OSNAME in
|
||||
CYGWIN*)
|
||||
OSNAME=CYGWIN
|
||||
TESTRUNNER=$TESTRUNNER.exe
|
||||
;;
|
||||
MINGW*)
|
||||
OSNAME=MinGW ;;
|
||||
esac
|
||||
fi
|
||||
if [ "$OSARCH" = "" ] ; then
|
||||
OSARCH=`uname -m | tr ' /' _-`
|
||||
|
@ -433,6 +433,24 @@ buildwin 100 build shared both Win32 samples vcexpress
|
||||
ENDOFSCRIPT
|
||||
|
||||
|
||||
#
|
||||
# Create Visual C++ Express 2012 build script
|
||||
#
|
||||
cat >${target}/build_vdexpress2012.cmd <<'ENDOFSCRIPT'
|
||||
@echo off
|
||||
buildwin 110 build shared both Win32 samples tests vdexpress
|
||||
ENDOFSCRIPT
|
||||
|
||||
|
||||
#
|
||||
# Create Visual C++ Express 2013 build script
|
||||
#
|
||||
cat >${target}/build_vdexpress2013.cmd <<'ENDOFSCRIPT'
|
||||
@echo off
|
||||
buildwin 120 build shared both Win32 samples tests vdexpress
|
||||
ENDOFSCRIPT
|
||||
|
||||
|
||||
#
|
||||
# Fix line endings
|
||||
#
|
||||
@ -444,6 +462,8 @@ if [ "$lineEndConv" != "" ] ; then
|
||||
$lineEndConv ${target}/build_CE_vs90.cmd
|
||||
$lineEndConv ${target}/build_vcexpress2008.cmd
|
||||
$lineEndConv ${target}/build_vcexpress2010.cmd
|
||||
$lineEndConv ${target}/build_vdexpress2012.cmd
|
||||
$lineEndConv ${target}/build_vdexpress2013.cmd
|
||||
$lineEndConv ${target}/Makefile
|
||||
$lineEndConv ${target}/components
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user