Merge of r61, r62, r63, r64.
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.4.x@65 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
parent
591e0d3e25
commit
b8cac59dd9
65
README
65
README
@ -1,4 +1,4 @@
|
|||||||
Linux* SDK for UPnP* Devices (libupnp)
|
Portable SDK for UPnP* Devices (libupnp)
|
||||||
|
|
||||||
Copyright (c) 2000-2003 Intel Corporation - All Rights Reserved.
|
Copyright (c) 2000-2003 Intel Corporation - All Rights Reserved.
|
||||||
Copyright (c) 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
|
Copyright (c) 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
|
||||||
@ -22,8 +22,8 @@ sections:
|
|||||||
1) Release Contents
|
1) Release Contents
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
The Linux SDK for UPnP Devices is an SDK for development of UPnP device
|
The Portable SDK for UPnP Devices is an SDK for development of UPnP device
|
||||||
and control point applications for Linux. It consists of the core UPnP
|
and control point applications. It consists of the core UPnP
|
||||||
protocols along with a UPnP-specific eXtensible Markup Language (XML) parser
|
protocols along with a UPnP-specific eXtensible Markup Language (XML) parser
|
||||||
supporting the Document Object Model (DOM) Level 2 API and an optional,
|
supporting the Document Object Model (DOM) Level 2 API and an optional,
|
||||||
integrated mini web server for serving UPnP related documents.
|
integrated mini web server for serving UPnP related documents.
|
||||||
@ -32,7 +32,7 @@ integrated mini web server for serving UPnP related documents.
|
|||||||
2) Package Contents
|
2) Package Contents
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
The Linux SDK for UPnP Devices contains the following:
|
The SDK for UPnP Devices contains the following:
|
||||||
|
|
||||||
README This file. Contains the installation and build instructions.
|
README This file. Contains the installation and build instructions.
|
||||||
LICENSE The licensing terms the SDK is distributed under.
|
LICENSE The licensing terms the SDK is distributed under.
|
||||||
@ -55,11 +55,10 @@ upnp\sample A sample device and control point application, illustrating the
|
|||||||
3) System Requirements
|
3) System Requirements
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
The SDK for UPnP Devices is designed to compile and run under the
|
The SDK for UPnP Devices is designed to compile and run under several
|
||||||
Linux operating system. It does, however, have dependencies on some
|
operating systems. It does, however, have dependencies on some
|
||||||
packages that may not be installed by default. All packages that it
|
packages that may not be installed by default. All packages that it
|
||||||
requires are listed below. The name of the package and where it can be
|
requires are listed below.
|
||||||
found is dependent on the distribution of Linux being used.
|
|
||||||
|
|
||||||
libpthread The header and library are installed as part of the glibc-devel
|
libpthread The header and library are installed as part of the glibc-devel
|
||||||
package (or equivalent).
|
package (or equivalent).
|
||||||
@ -83,7 +82,7 @@ ps2pdf The final step to making the PDF is converting the PostStript
|
|||||||
into Portable Document Format. The ghostscript package provides
|
into Portable Document Format. The ghostscript package provides
|
||||||
this tool.
|
this tool.
|
||||||
|
|
||||||
For the UPnP library to function correctly, Linux networking must be configured
|
For the UPnP library to function correctly, networking must be configured
|
||||||
properly for multicasting. To do this:
|
properly for multicasting. To do this:
|
||||||
|
|
||||||
route add -net 239.0.0.0 netmask 255.0.0.0 eth0
|
route add -net 239.0.0.0 netmask 255.0.0.0 eth0
|
||||||
@ -93,14 +92,6 @@ this addition, device advertisements and control point searches will not
|
|||||||
function.
|
function.
|
||||||
|
|
||||||
|
|
||||||
libupnp has been built and tested on the following configurations:
|
|
||||||
|
|
||||||
* MandrakeLinux 10.1 (kernel 2.6.8.1-12mdk, gcc 3.4.1, glibc-2.3.3)
|
|
||||||
|
|
||||||
* Ubuntu 5.10 "Breezy Badger" (Linux kernel 2.6.12-9-386, gcc 4.0.2 20050808
|
|
||||||
prerelease, libc6 2.3.5-1ubuntu12)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
4) Build Instructions
|
4) Build Instructions
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
@ -169,7 +160,7 @@ To build without:
|
|||||||
% make
|
% make
|
||||||
|
|
||||||
|
|
||||||
The SDK for Linux also contains some additional helper APIs, declared in
|
The SDK also contains some additional helper APIs, declared in
|
||||||
inc/tools/upnptools.h. If these additional tools are not required, they can
|
inc/tools/upnptools.h. If these additional tools are not required, they can
|
||||||
be compiled out:
|
be compiled out:
|
||||||
|
|
||||||
@ -249,6 +240,39 @@ sub-directory. Example :
|
|||||||
% ../../upnp_tv_device
|
% ../../upnp_tv_device
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
SOLARIS BUILD
|
||||||
|
|
||||||
|
The building process for the Solaris operating system is similar to the one
|
||||||
|
described above. Only the call to ./configure has to be done using an
|
||||||
|
additional parameter:
|
||||||
|
|
||||||
|
./configure CFLAGS="-mcpu=<cputype> -mtune=<cputype> -DSPARC_SOLARIS"
|
||||||
|
|
||||||
|
where <cputype> has to be replaced by the appropriate CPU tuning flag (e.g.
|
||||||
|
"supersparc"). Afterwards
|
||||||
|
|
||||||
|
make
|
||||||
|
make install
|
||||||
|
|
||||||
|
can be called as described above.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
WINDOWS BUILD
|
||||||
|
|
||||||
|
In order to build libupnp under Windows the pthreads-w32 package is required.
|
||||||
|
You can download a self-extracting ZIP file from the following location:
|
||||||
|
|
||||||
|
ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-2-7-0-release.exe
|
||||||
|
|
||||||
|
Execute the self-extracting archive and copy the Pre-build.2 folder to the
|
||||||
|
top level source folder.
|
||||||
|
Rename Pre-build.2 to pthreads.
|
||||||
|
Open the provided workspace build\libupnp.dsw with Visual C++ 6.0 and select
|
||||||
|
Build->Build libupnp.dll (F7)
|
||||||
|
|
||||||
|
|
||||||
5) Install/Uninstall Instructions
|
5) Install/Uninstall Instructions
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
@ -290,9 +314,8 @@ See NEWS file.
|
|||||||
8) Support and Contact Information
|
8) Support and Contact Information
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
Intel is not providing support for the Linux SDK for UPnP Devices. Two
|
Intel is not providing support for the SDK for UPnP Devices. Mailing lists
|
||||||
mailing lists for the SDK are available on http://upnp.sourceforge.net/.
|
and discussion boards can be found at http://www.libupnp.org/.
|
||||||
Questions and problems should be addressed on the appropriate mailing list.
|
|
||||||
|
|
||||||
If you find this SDK useful, please send an email to upnp@intel.com and let
|
If you find this SDK useful, please send an email to upnp@intel.com and let
|
||||||
us know.
|
us know.
|
||||||
|
1
THANKS
1
THANKS
@ -6,6 +6,7 @@ suggesting various improvements or submitting actual code.
|
|||||||
Here is a list of these people. Help us keep it complete and
|
Here is a list of these people. Help us keep it complete and
|
||||||
exempt of errors.
|
exempt of errors.
|
||||||
|
|
||||||
|
- Paul Vixie
|
||||||
- Arno Willig
|
- Arno Willig
|
||||||
- Eric Tanguy
|
- Eric Tanguy
|
||||||
- Oskar Liljeblad
|
- Oskar Liljeblad
|
||||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /c
|
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /c
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "E:\svnupnp\trunk\ixml\src\inc" /I "E:\svnupnp\trunk\ixml\inc" /I "E:\svnupnp\trunk\threadutil\inc" /I "E:\svnupnp\trunk\upnp\inc" /I "E:\svnupnp\trunk\upnp\src\inc" /I "E:\svnupnp\trunk\build\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /c
|
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I ".\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /c
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||||
# ADD BASE RSC /l 0x407 /d "NDEBUG"
|
# ADD BASE RSC /l 0x407 /d "NDEBUG"
|
||||||
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||||
# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib E:\svnupnp\trunk\libupnp\build\bin\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
|
# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "libupnp - Win32 Debug"
|
!ELSEIF "$(CFG)" == "libupnp - Win32 Debug"
|
||||||
|
|
||||||
@ -69,7 +69,7 @@ LINK32=link.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /GZ /c
|
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /GZ /c
|
||||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "E:\svnupnp\trunk\ixml\src\inc" /I "E:\svnupnp\trunk\ixml\inc" /I "E:\svnupnp\trunk\threadutil\inc" /I "E:\svnupnp\trunk\upnp\inc" /I "E:\svnupnp\trunk\upnp\src\inc" /I "E:\svnupnp\trunk\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /GZ /c
|
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I "..\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /GZ /c
|
||||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||||
# ADD BASE RSC /l 0x407 /d "_DEBUG"
|
# ADD BASE RSC /l 0x407 /d "_DEBUG"
|
||||||
@ -79,7 +79,7 @@ BSC32=bscmake.exe
|
|||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||||
# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib E:\svnupnp\trunk\libupnp\build\bin\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||||
|
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user