This commit is contained in:
Guenter Obiltschnig 2014-05-19 21:44:34 +02:00
Родитель e97f9227e8 14fa1aa28f
Коммит 501aa9de1f
3 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -58,7 +58,7 @@
#elif defined(__digital__) || defined(__osf__)
#define POCO_OS_FAMILY_UNIX 1
#define POCO_OS POCO_OS_TRU64
#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__TOS_LINUX__)
#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__TOS_LINUX__) || defined(EMSCRIPTEN)
#define POCO_OS_FAMILY_UNIX 1
#define POCO_OS POCO_OS_LINUX
#elif defined(__APPLE__) || defined(__TOS_MACOS__)
@ -136,7 +136,7 @@
#if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
#define POCO_ARCH POCO_ARCH_ALPHA
#define POCO_ARCH_LITTLE_ENDIAN 1
#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(EMSCRIPTEN)
#define POCO_ARCH POCO_ARCH_IA32
#define POCO_ARCH_LITTLE_ENDIAN 1
#elif defined(_IA64) || defined(__IA64__) || defined(__ia64__) || defined(__ia64) || defined(_M_IA64)

Просмотреть файл

@ -50,8 +50,8 @@ HTTPServer::~HTTPServer()
void HTTPServer::stopAll(bool abortCurrent)
{
_pFactory->serverStopped(this, abortCurrent);
stop();
_pFactory->serverStopped(this, abortCurrent);
}

Просмотреть файл

@ -49,10 +49,10 @@ SHAREDLIBLINKEXT = .dylib
# Compiler and Linker Flags
#
CFLAGS = $(ARCHFLAGS)
CXXFLAGS = $(ARCHFLAGS) -stdlib=libc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
CXXFLAGS = $(ARCHFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration
LINKFLAGS = $(ARCHFLAGS) -stdlib=libc++
SHLIBFLAGS = $(ARCHFLAGS) -stdlib=libc++
DYLIBFLAGS = $(ARCHFLAGS)
DYLIBFLAGS = $(ARCHFLAGS) -stdlib=libc++
STATICOPT_CC =
STATICOPT_CXX =
STATICOPT_LINK =