2006-06-06 10:51:22 +02:00
|
|
|
#
|
|
|
|
|
# "Makefile.am" for "libupnp/upnp"
|
|
|
|
|
#
|
2008-07-25 06:11:17 +02:00
|
|
|
# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
|
2006-06-06 10:51:22 +02:00
|
|
|
#
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
SUBDIRS = doc . sample
|
2006-06-06 10:51:22 +02:00
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-I$(srcdir)/inc \
|
|
|
|
|
-I$(top_srcdir)/threadutil/inc \
|
|
|
|
|
-I$(top_srcdir)/ixml/inc
|
2006-06-06 10:51:22 +02:00
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
LDADD = \
|
|
|
|
|
libupnp.la \
|
|
|
|
|
$(top_builddir)/threadutil/libthreadutil.la \
|
|
|
|
|
$(top_builddir)/ixml/libixml.la
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
upnpincludedir = $(includedir)/upnp
|
2007-05-26 17:44:52 +02:00
|
|
|
upnpinclude_HEADERS = \
|
2010-04-25 02:44:34 +02:00
|
|
|
inc/UpnpString.h \
|
2007-05-26 17:44:52 +02:00
|
|
|
inc/upnp.h \
|
2008-07-25 05:22:35 +02:00
|
|
|
inc/upnpdebug.h \
|
2008-07-27 05:06:21 +02:00
|
|
|
inc/UpnpGlobal.h \
|
|
|
|
|
inc/UpnpInet.h
|
2007-05-26 17:44:52 +02:00
|
|
|
|
2006-06-06 10:51:22 +02:00
|
|
|
nodist_upnpinclude_HEADERS = inc/upnpconfig.h
|
|
|
|
|
if ENABLE_TOOLS
|
2007-05-11 07:00:43 +02:00
|
|
|
upnpinclude_HEADERS += inc/upnptools.h
|
2006-06-06 10:51:22 +02:00
|
|
|
endif
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
|
|
|
|
|
lib_LTLIBRARIES = libupnp.la
|
|
|
|
|
|
|
|
|
|
libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc
|
|
|
|
|
|
|
|
|
|
libupnp_la_LDFLAGS = \
|
|
|
|
|
-version-info $(LT_VERSION_UPNP) \
|
|
|
|
|
-export-symbols-regex '^Upnp.*' \
|
|
|
|
|
$(top_builddir)/threadutil/libthreadutil.la \
|
|
|
|
|
$(top_builddir)/ixml/libixml.la
|
|
|
|
|
|
|
|
|
|
libupnp_la_SOURCES = \
|
|
|
|
|
src/inc/config.h \
|
|
|
|
|
src/inc/client_table.h \
|
|
|
|
|
src/inc/gena.h \
|
|
|
|
|
src/inc/gena_ctrlpt.h \
|
|
|
|
|
src/inc/gena_device.h \
|
|
|
|
|
src/inc/global.h \
|
|
|
|
|
src/inc/gmtdate.h \
|
|
|
|
|
src/inc/httpparser.h \
|
|
|
|
|
src/inc/httpreadwrite.h \
|
|
|
|
|
src/inc/md5.h \
|
|
|
|
|
src/inc/membuffer.h \
|
|
|
|
|
src/inc/miniserver.h \
|
|
|
|
|
src/inc/netall.h \
|
|
|
|
|
src/inc/parsetools.h \
|
|
|
|
|
src/inc/server.h \
|
|
|
|
|
src/inc/service_table.h \
|
|
|
|
|
src/inc/soaplib.h \
|
|
|
|
|
src/inc/sock.h \
|
|
|
|
|
src/inc/statcodes.h \
|
|
|
|
|
src/inc/statuscodes.h \
|
|
|
|
|
src/inc/strintmap.h \
|
|
|
|
|
src/inc/ssdplib.h \
|
|
|
|
|
src/inc/sysdep.h \
|
|
|
|
|
src/inc/unixutil.h \
|
|
|
|
|
src/inc/upnpapi.h \
|
|
|
|
|
src/inc/upnp_timeout.h \
|
|
|
|
|
src/inc/uri.h \
|
|
|
|
|
src/inc/urlconfig.h \
|
|
|
|
|
src/inc/util.h \
|
|
|
|
|
src/inc/utilall.h \
|
|
|
|
|
src/inc/uuid.h \
|
1 - Ported some of IPV6 code to 1.6.7.
2 - Backport of svn revision 527:
* Added API to ithread, created the following functions:
- int ithread_initialize_library(void);
- int ithread_cleanup_library(void);
- int ithread_initialize_thread(void);
- int ithread_cleanup_thread(void);
* SF Bug Tracker [ 2876374 ] Access Violation when compiling with Visual Studio 2008
Submitted: Stulle ( stulleamgym ) - 2009-10-10 19:05
Hi,
I am one of the devs of the MorphXT project and I use this lib in some
other of my projects, too. When I tried to upgrade the lib earlier for one
of my projects I had to realise that something did not work at first and
while most of the things were reasonably ease to be fixed. Now, the last
thing I encountered was not so easy to fix and I am uncertain if my fix is
any good so I'll just post it here and wait for some comments.
The problem was that I got an Access Violation when calling "UpnpInit". It
would call "ithread_rwlock_init(&GlobalHndRWLock, NULL)" which eventually
led to calling "pthread_cond_init" and I got the error notice at
"EnterCriticalSection (&ptw32_cond_list_lock);". It appeared that
"ptw32_cond_list_lock" was NULL. Now, I found two ways to fix this. Firstly
moving the whole block after at least one of the "ThreadPoolInit" calls
will fix the issue. Secondly, you could add:
#ifdef WIN32
#ifdef PTW32_STATIC_LIB
// to get the following working we need this... is it a good patch or
not... I do not know!
pthread_win32_process_attach_np();
#endif
#endif
right before "ithread_rwlock_init(&GlobalHndRWLock, NULL)".
Just so you know, I am using libupnp 1.6.6 and libpthreads 2.8.0 and both
are linked static into the binaries. I am currently using Visual Studio
2008 for development with Windows being the target OS. Any comment at your
end?
Regards, Stulle
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@529 119443c7-1b9e-41f8-b6fc-b9c35fce742c
2010-03-31 19:53:16 +02:00
|
|
|
src/inc/VirtualDir.h \
|
2007-05-11 07:00:43 +02:00
|
|
|
src/inc/webserver.h
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
# ssdp
|
2007-05-11 07:00:43 +02:00
|
|
|
libupnp_la_SOURCES += \
|
|
|
|
|
src/ssdp/ssdp_device.c \
|
|
|
|
|
src/ssdp/ssdp_ctrlpt.c \
|
|
|
|
|
src/ssdp/ssdp_server.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
# soap
|
2007-05-11 07:00:43 +02:00
|
|
|
libupnp_la_SOURCES += \
|
|
|
|
|
src/soap/soap_device.c \
|
|
|
|
|
src/soap/soap_ctrlpt.c \
|
|
|
|
|
src/soap/soap_common.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
# genlib
|
2007-05-11 07:00:43 +02:00
|
|
|
libupnp_la_SOURCES += \
|
|
|
|
|
src/genlib/miniserver/miniserver.c \
|
|
|
|
|
src/genlib/service_table/service_table.c \
|
|
|
|
|
src/genlib/util/membuffer.c \
|
|
|
|
|
src/genlib/util/strintmap.c \
|
|
|
|
|
src/genlib/util/upnp_timeout.c \
|
|
|
|
|
src/genlib/util/util.c \
|
|
|
|
|
src/genlib/client_table/client_table.c \
|
|
|
|
|
src/genlib/net/sock.c \
|
|
|
|
|
src/genlib/net/http/httpparser.c \
|
|
|
|
|
src/genlib/net/http/httpreadwrite.c \
|
|
|
|
|
src/genlib/net/http/statcodes.c \
|
|
|
|
|
src/genlib/net/http/webserver.c \
|
|
|
|
|
src/genlib/net/http/parsetools.c \
|
|
|
|
|
src/genlib/net/uri/uri.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
# gena
|
2007-05-11 07:00:43 +02:00
|
|
|
libupnp_la_SOURCES += \
|
|
|
|
|
src/gena/gena_device.c \
|
|
|
|
|
src/gena/gena_ctrlpt.c \
|
|
|
|
|
src/gena/gena_callback2.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
# api
|
2008-07-27 05:06:21 +02:00
|
|
|
libupnp_la_SOURCES += \
|
2010-04-25 02:44:34 +02:00
|
|
|
src/api/UpnpString.c \
|
2008-07-27 05:06:21 +02:00
|
|
|
src/api/upnpapi.c
|
|
|
|
|
|
2006-06-06 10:51:22 +02:00
|
|
|
if ENABLE_TOOLS
|
2007-05-11 07:00:43 +02:00
|
|
|
libupnp_la_SOURCES += src/api/upnptools.c
|
2006-06-06 10:51:22 +02:00
|
|
|
endif
|
2008-07-25 06:11:17 +02:00
|
|
|
|
2006-06-06 10:51:22 +02:00
|
|
|
if ENABLE_DEBUG
|
2007-05-11 07:00:43 +02:00
|
|
|
libupnp_la_SOURCES += src/api/upnpdebug.c
|
2006-06-06 10:51:22 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
# uuid
|
|
|
|
|
libupnp_la_SOURCES += \
|
|
|
|
|
src/uuid/md5.c \
|
|
|
|
|
src/uuid/sysdep.c \
|
|
|
|
|
src/uuid/uuid.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
# urlconfig
|
|
|
|
|
libupnp_la_SOURCES += src/urlconfig/urlconfig.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
|
2008-07-25 06:11:17 +02:00
|
|
|
# inet_pton (needed on Win32, compiles to nothing elsewhere)
|
|
|
|
|
libupnp_la_SOURCES += \
|
|
|
|
|
src/inet_pton.c \
|
|
|
|
|
src/inc/inet_pton.h
|
|
|
|
|
|
|
|
|
|
|
2006-06-06 10:51:22 +02:00
|
|
|
# check / distcheck tests
|
2007-05-11 07:00:43 +02:00
|
|
|
check_PROGRAMS = test_init
|
|
|
|
|
TESTS = test_init
|
|
|
|
|
test_init_SOURCES = test/test_init.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
EXTRA_DIST = \
|
|
|
|
|
LICENSE \
|
2008-07-25 06:11:17 +02:00
|
|
|
m4/libupnp.m4 \
|
2007-05-11 07:00:43 +02:00
|
|
|
src/win_dll.c
|
2006-06-06 10:51:22 +02:00
|
|
|
|
|
|
|
|
|
2007-05-11 07:00:43 +02:00
|
|
|
CLEANFILES = \
|
|
|
|
|
IUpnpErrFile.txt \
|
|
|
|
|
IUpnpInfoFile.txt
|
2006-06-06 10:51:22 +02:00
|
|
|
|