diff --git a/NEWS b/NEWS index 1d3eb2b5..e721b58b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,117 @@ +Icecast 2.3.2 +----------------------------------------------------------------------------- +- Character set support. +Most non-Ogg streams (eg MP3) send metadata as Latin1 but it could be in other +character sets. As icecast uses UTF-8, we need to convert to UTF-8 so that web +pages and stream directories render correctly, + . Allow a per-mount setting. For when source clients do not + indicate which character set is in use. + . a charset= parameter to the metadata request. + . Default for non-Ogg content is now Latin-1 (aka ISO-8859-1), Ogg content + still use UTF-8. + +- Authentication + . Each mountpoint authentication is isolated so one mount authentication does + not slow another mountpoint authentication down. + . XSL pages can require authentication. + . Add some sanity checks for incorrect settings. + +- Listening socket update + . Allow multiple ports to be allocated which allow multiple shoutcast source + clients to stream on the same icecast instance. + . No internal limit on the number of listen-sockets that can be used. + . Allow for a listen-socket to be marked SSL capable. While any client could + connect on these, the idea is really for /admin requests. + . allow for a to bind to ipv4 and ipv6. BSDs may require to + the use of bind-address. + +- XSL update + . XSL pages include an xspf link for non-auth streams. + . XSL pages in both webroot and adminroot can take a mount= arg to limit + which stats are transformed. + . XSL files can specify the content-type to return to the client. It is no + longer fixed to html + +- Updates for stream directory handling. + . A stream is not registered with the directory until after the first minute + has passed. some streams have been stuck in a connect/disconnect loop. + . Increase retry time on failure, if the stream add is rejected then it will + be down to a misconfiguration so a long retry delay is performed. + . A YP server that is not responding is ignored for a while + +- Updates for Win32 + . Build cleanups, + . Newer versions of dependency libs (libxml2/libxslt/libcurl etc) + . buffer overflow fixes when many streams are active + +- Accept/Ban IP support. +Now takes filenames for explicitly accepting or denying requests from specified +IP addresses. Useful in cases where firewall access is not available. The +files, if defined, are re-read automatically if updated. + +- A Mountpoint is exported to the slaves even if no mount section is defined for +it. You can still use the hidden setting to prevent that from happening. + +- Relays handle redirection (HTTP 302) if one is received at startup. + +- Automatically generate XSPF playlist like we do with M3U, the mountpoint +extension is .xspf + +- Header updates for proxy handling and certain clients like some shoutcast +source clients and flash players. + +- Added Kate/Skeleton codecs to Ogg handler. + +- Various stats cleanups. Added some global stats (server ID, email contact etc). + +- Documentation updates. + +- The streamlist passed from master to slave had a limited length, so if there +were many streams then some could of been left out. + +- Relay startup/shutdown is cleaner. + +- several build cleanups. + +- several resource leaks and race conditions fixed + + +Icecast 2.3.1 +----------------------------------------------------------------------------- + +- new tag in state the trigger size (in KB) for cycling the +log files. + +- new tag in enable (1) if you want to use a timestamp +for an extension when cycling logs. + +- Handling of certain shoutcast source clients is fixed, this typically +affected NSV source clients + +- A race in source shutdown when listeners are authenticated could lead to +server crash + +- An audio glitch was possible in playback of vorbis streams when a new logical +stream started (eg metadata update). + +- stats speedup. Processing large numbers of stats was slow. Typically only +seen when using lots of streams on the same server. + +- 404 responses were being sent back in some places, now 403 is sent back. + +- Auth URL now handles the authentication to scripts better. + The order in which username/password are selected is + 1. url is http://user:pass@host:port/.... + 2. and + 3. with listener_add/remove, listener supplied username/password is used. + +- A streams intro file can now be changed, using HUP, on active streams. + +- mount without a name crashed the server + +- Various documentation updates + + Icecast 2.3 ----------------------------------------------------------------------------- **** New features for 2.3.0 **** diff --git a/README b/README index d0d1aa92..a4cc574a 100644 --- a/README +++ b/README @@ -1,12 +1,13 @@ icecast 2.x - README --------------------------------------------------------------------- -Icecast is a streaming media server which currently supports Ogg -Vorbis and MP3 audio streams. It can be used to create an Internet -radio station or a privately running jukebox and many things in -between. It is very versatile in that new formats can be added -relatively easily and supports open standards for communication and -interaction. +Icecast is a streaming media server which currently supports Ogg +streaming including the vorbis and theora codecs. Also icecast can +handle other streams like MP3/AAC/NSV. +It can be used to create an Internet radio station or a privately +running jukebox and many things in between. It is very versatile in +that new formats can be added relatively easily and supports open +standards for communication and interaction. Icecast is distributed under the GNU GPL, version 2. A copy of this license is included with this software in the COPYING file. @@ -19,20 +20,18 @@ icecast requires the following packages : * libxslt - http://xmlsoft.org/XSLT/downloads.html * curl - http://curl.haxx.se/download.html (>= version 7.10 required) NOTE: icecast may be compiled without curl, however this will - disable all Directory server interaction (YP). + disable Stream Directory server interaction (YP) and URL based + authentication. * ogg/vorbis - http://www.vorbis.com/files (>= version 1.0 required) -A Note About RPMS +A note about prerequisite packages --------------------------------------------------------------------- -This section only applies to you if your operating system uses RPMS. - -In order to build icecast, you will need to install the "devel" RPM -packages for each of the prerequisite packages in addition to the -normal RPMS for each package. - -please check the websites for each of the prerequisite packages for -appropriate download links for RPMS. - +Most distributions have some sort of package management repository for +pre-built packages (eg rpm, deb etc). These setups often have a runtime +package, which is usually installed for you by default, and enables you +to run applications that depend on them. However if you are building +icecast from source then the runtime system is not enough. You will also +need a development package named something like libxslt-devel Build/Install --------------------------------------------------------------------- @@ -43,7 +42,9 @@ Run make make install -To build and install this release. +This is the typical procedure if you download the tar file. If you retrive +the code from subversion or want to rebuild the configure then run autogen.sh +instead of the configure above. Most people do not need to run autogen.sh A sample config file will be placed in /usr/local/etc (on UNIX) or in the current working directory (on Win32) and is called icecast.xml diff --git a/configure.in b/configure.in index e727d356..aedf6a1c 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT([Icecast], [trunk], [icecast@xiph.org]) +AC_INIT([Icecast], [2.3.2], [icecast@xiph.org]) AC_PREREQ(2.54) AC_CONFIG_SRCDIR(src/main.c) diff --git a/examples/icecast_auth-1.0.tar.gz b/examples/icecast_auth-1.0.tar.gz index ca2d5610..d9e5bded 100644 Binary files a/examples/icecast_auth-1.0.tar.gz and b/examples/icecast_auth-1.0.tar.gz differ diff --git a/icecast.spec b/icecast.spec index ab96c9a1..3d0ec19a 100644 --- a/icecast.spec +++ b/icecast.spec @@ -1,7 +1,7 @@ Name: icecast -Version: 2.3.1 +Version: 2.3.2 Release: 0 -Summary: Xiph Streaming media server that supports multiple audio formats. +Summary: Xiph Streaming media server that supports multiple formats. Group: Applications/Multimedia License: GPL URL: http://www.icecast.org/ diff --git a/win32/Icecast2win.dsp b/win32/Icecast2win.dsp index 096a9ed5..c226f120 100644 --- a/win32/Icecast2win.dsp +++ b/win32/Icecast2win.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D PACKAGE_VERSION=\"trunk\" /D "USE_YP" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D PACKAGE_VERSION=\"2.3.2\" /D "USE_YP" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 libcurl.lib ogg_static_d.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib winmm.lib theora_static_d.lib libspeex.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib" +# ADD LINK32 libcurl.lib ogg_static_d.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib winmm.lib theora_static_d.lib libspeex.lib /nologo /version:2.3 /subsystem:windows /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Icecast2win - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../src" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D PACKAGE_VERSION=\"trunk\" /D "USE_YP" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../src" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D PACKAGE_VERSION=\"2.3.2\" /D "USE_YP" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/win32/icecast.dsp b/win32/icecast.dsp index 8e9f87a8..a90fcad3 100644 --- a/win32/icecast.dsp +++ b/win32/icecast.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "releaselib_tmp" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../curl/include" /I "..\src" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"trunk\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /D sock_t=SOCKET /D "HAVE_WINSOCK2_H" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../curl/include" /I "..\src" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.2\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /D sock_t=SOCKET /D "HAVE_WINSOCK2_H" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "debuglib_tmp" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../curl/include" /I "..\src" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"trunk\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /FD /D /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../curl/include" /I "..\src" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.2\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /FD /D /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win32/icecast2.iss b/win32/icecast2.iss index 5ff86310..bd2992c9 100644 --- a/win32/icecast2.iss +++ b/win32/icecast2.iss @@ -3,7 +3,7 @@ [Setup] AppName=Icecast2 Win32 -AppVerName=Icecast trunk +AppVerName=Icecast 2.3.2 AppPublisherURL=http://www.icecast.org AppSupportURL=http://www.icecast.org AppUpdatesURL=http://www.icecast.org @@ -13,7 +13,7 @@ AllowNoIcons=yes LicenseFile=..\COPYING InfoAfterFile=..\README OutputDir=. -OutputBaseFilename=icecast2_win32_trunk_setup +OutputBaseFilename=icecast2_win32_2.3.2_setup WizardImageFile=icecast2logo2.bmp WizardImageStretch=no ; uncomment the following line if you want your installation to run on NT 3.51 too. @@ -42,7 +42,7 @@ Source: "..\web\*.jpg"; DestDir: "{app}\web"; Flags: ignoreversion Source: "..\web\*.css"; DestDir: "{app}\web"; Flags: ignoreversion Source: "..\admin\*.xsl"; DestDir: "{app}\admin"; Flags: ignoreversion Source: "c:\xiph\lib\pthreadVSE.dll"; DestDir: "{app}"; Flags: ignoreversion -;Source: "..\conf\*.xml"; DestDir: "{app}"; Flags: ignoreversion +Source: "icecast.xml"; DestDir: "{app}"; Flags: ignoreversion Source: "c:\xiph\lib\iconv.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "c:\xiph\lib\libxslt.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "c:\xiph\lib\libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion diff --git a/win32/icecast2_console.dsp b/win32/icecast2_console.dsp index 706913cb..f3048ff3 100644 --- a/win32/icecast2_console.dsp +++ b/win32/icecast2_console.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"trunk\" /D "HAVE_THEORA" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.2\" /D "HAVE_THEORA" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 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 /subsystem:console /machine:I386 -# ADD 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcurl.lib ogg_static_d.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib theora_static_d.lib libspeex.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib" /out:"Release/icecast2console.exe" +# ADD 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcurl.lib ogg_static_d.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib theora_static_d.lib libspeex.lib /nologo /version:2.3 /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib" /out:"Release/icecast2console.exe" !ELSEIF "$(CFG)" == "icecast2 console - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"trunk\" /D "HAVE_THEORA" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.2\" /D "HAVE_THEORA" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win32/icecastService.dsp b/win32/icecastService.dsp index 28ec1741..48a60afc 100644 --- a/win32/icecastService.dsp +++ b/win32/icecastService.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"trunk\" /D "HAVE_THEORA" /YX /FD /D PACKAGE_STRING=\"Icecast-trunk\" /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.2\" /D "HAVE_THEORA" /YX /FD /D PACKAGE_STRING=\"Icecast-trunk\" /c # SUBTRACT CPP /X # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"trunk\" /D "HAVE_THEORA" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.2\" /D "HAVE_THEORA" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe