trunk/branch integration: VxWorks & Wince

This commit is contained in:
Marian Krivos
2011-08-22 18:15:49 +00:00
parent 9e092a46fa
commit d22a493810

View File

@@ -1,7 +1,7 @@
// //
// Foundation.h // Foundation.h
// //
// $Id: //poco/svn/Foundation/include/Poco/Foundation.h#2 $ // $Id: //poco/1.4/Foundation/include/Poco/Foundation.h#2 $
// //
// Library: Foundation // Library: Foundation
// Package: Core // Package: Core
@@ -11,7 +11,7 @@
// This file must be the first file included by every other Foundation // This file must be the first file included by every other Foundation
// header file. // header file.
// //
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. // Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH.
// and Contributors. // and Contributors.
// //
// Permission is hereby granted, free of charge, to any person or organization // Permission is hereby granted, free of charge, to any person or organization
@@ -42,12 +42,6 @@
#define Foundation_Foundation_INCLUDED #define Foundation_Foundation_INCLUDED
//
// Version Information
//
#define POCO_VERSION 0x010400D0
// //
// Include library configuration // Include library configuration
// //
@@ -72,7 +66,7 @@
// Foundation_API functions as being imported from a DLL, wheras this DLL sees symbols // Foundation_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported. // defined with this macro as being exported.
// //
#if defined(_WIN32) && defined(POCO_DLL) #if (defined(_WIN32) || defined(_WIN32_WCE)) && defined(POCO_DLL)
#if defined(Foundation_EXPORTS) #if defined(Foundation_EXPORTS)
#define Foundation_API __declspec(dllexport) #define Foundation_API __declspec(dllexport)
#else #else
@@ -90,20 +84,28 @@
// Automatically link Foundation library. // Automatically link Foundation library.
// //
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(Foundation_EXPORTS) #if defined(POCO_DLL)
#if defined(POCO_DLL) #if defined(_DEBUG)
#if defined(_DEBUG) #define POCO_LIB_SUFFIX "d.lib"
#pragma comment(lib, "PocoFoundationd.lib")
#else
#pragma comment(lib, "PocoFoundation.lib")
#endif
#else #else
#if defined(_DEBUG) #define POCO_LIB_SUFFIX ".lib"
#pragma comment(lib, "PocoFoundationmtd.lib")
#else
#pragma comment(lib, "PocoFoundationmt.lib")
#endif
#endif #endif
#elif defined(_DLL)
#if defined(_DEBUG)
#define POCO_LIB_SUFFIX "mdd.lib"
#else
#define POCO_LIB_SUFFIX "md.lib"
#endif
#else
#if defined(_DEBUG)
#define POCO_LIB_SUFFIX "mtd.lib"
#else
#define POCO_LIB_SUFFIX "mt.lib"
#endif
#endif
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(Foundation_EXPORTS)
#pragma comment(lib, "PocoFoundation" POCO_LIB_SUFFIX)
#endif #endif
#endif #endif
@@ -116,6 +118,8 @@
#include "Poco/Platform_WIN32.h" #include "Poco/Platform_WIN32.h"
#elif defined(__VMS) #elif defined(__VMS)
#include "Poco/Platform_VMS.h" #include "Poco/Platform_VMS.h"
#elif defined(POCO_VXWORKS)
#include "Poco/Platform_VX.h"
#elif defined(POCO_OS_FAMILY_UNIX) #elif defined(POCO_OS_FAMILY_UNIX)
#include "Poco/Platform_POSIX.h" #include "Poco/Platform_POSIX.h"
#endif #endif