[xiph-cvs] cvs commit: icecast/win32 Icecast2win.dsp Makefile.am icecast.dsp icecast2.iss

Ed oddsock at xiph.org
Sun Feb 2 06:22:25 PST 2003 


oddsock     03/02/02 09:22:25

  Modified:    win32    Icecast2win.dsp Makefile.am icecast.dsp
                        icecast2.iss
  Log:
  added references to libcurl (needed for yp-listing in icecast2)

Revision  Changes    Path
1.6       +2 -2      icecast/win32/Icecast2win.dsp

Index: Icecast2win.dsp
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/Icecast2win.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Icecast2win.dsp	23 Nov 2002 15:54:50 -0000	1.5
+++ Icecast2win.dsp	2 Feb 2003 14:22:25 -0000	1.6
@@ -53,7 +53,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 Releaseicecast\icecast.lib ..\..\oggvorbis-win32sdk-1.0\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0\lib\vorbis_static.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/Icecast2.exe"
+# ADD LINK32 Releaseicecast\icecast.lib ..\..\curl\lib\Release\libcurl.lib ..\..\oggvorbis-win32sdk-1.0\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0\lib\vorbis_static.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/Icecast2.exe"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "Icecast2win - Win32 Debug"
@@ -80,7 +80,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Debugicecast\icecast.lib ..\..\oggvorbis-win32sdk-1.0\lib\ogg_static_d.lib ..\..\oggvorbis-win32sdk-1.0\lib\vorbis_static_d.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept
+# ADD LINK32 Debugicecast\icecast.lib ..\..\curl\lib\Debug\libcurl.lib ..\..\oggvorbis-win32sdk-1.0\lib\ogg_static_d.lib ..\..\oggvorbis-win32sdk-1.0\lib\vorbis_static_d.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 

<p><p>1.2       +1 -1      icecast/win32/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	24 Sep 2002 08:16:24 -0000	1.1
+++ Makefile.am	2 Feb 2003 14:22:25 -0000	1.2
@@ -10,5 +10,5 @@
     ResizableDialog.h StatsTab.cpp StatsTab.h Status.cpp Status.h StdAfx.cpp \
     StdAfx.h TabCtrlSSL.cpp TabCtrlSSL.h TabPageSSL.cpp TabPageSSL.h black.bmp \
     colors.h icecast.dsp icecast.ico icecast.xml icecast2.iss icecast2logo2.bmp\
-    resource.h running.bmp status.xsl status2.xsl stopped.bmp
+    resource.h running.bmp stopped.bmp TRAYNOT.h Traynot.cpp
 

<p><p>1.6       +18 -2     icecast/win32/icecast.dsp

Index: icecast.dsp
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/icecast.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icecast.dsp	23 Nov 2002 15:54:50 -0000	1.5
+++ icecast.dsp	2 Feb 2003 14:22:25 -0000	1.6
@@ -41,7 +41,7 @@
 # PROP Intermediate_Dir "Releaseicecast"
 # 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 "../" /I "../../libxslt/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/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@
 # PROP Intermediate_Dir "Debugicecast"
 # 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 "../" /I "../../libxslt/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/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /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/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -153,6 +153,14 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\geturl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\geturl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\global.c
 # End Source File
 # Begin Source File
@@ -266,6 +274,14 @@
 # Begin Source File
 
 SOURCE=..\src\xslt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\yp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\yp.h
 # End Source File
 # End Group
 # Begin Group "Header Files"

<p><p>1.7       +8 -2      icecast/win32/icecast2.iss

Index: icecast2.iss
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/icecast2.iss,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icecast2.iss	31 Dec 2002 20:07:14 -0000	1.6
+++ icecast2.iss	2 Feb 2003 14:22:25 -0000	1.7
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=Icecast2 Win32
-AppVerName=Icecast2 Alpha 2
+AppVerName=Icecast v2.0
 AppPublisherURL=http://www.icecast.org
 AppSupportURL=http://www.icecast.org
 AppUpdatesURL=http://www.icecast.org
@@ -21,13 +21,19 @@
 [Tasks]
 Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4
 
+[Dirs]
+Name: "{app}\web"
+Name: "{app}\doc"
+Name: "{app}\logs"
+
+
 [Files]
 Source: "Release\Icecast2.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite
 Source: "..\doc\icecast2.chm"; DestDir: "{app}\doc"; CopyMode: alwaysoverwrite
 Source: "..\web\status.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite
 Source: "..\web\status2.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite
 Source: "..\..\pthreads\pthreadVSE.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
-Source: "icecast.xml"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "..\conf\icecast.xml"; DestDir: "{app}"; CopyMode: alwaysoverwrite
 Source: "..\..\iconv\lib\iconv.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
 Source: "..\..\libxslt\lib\libxslt.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
 Source: "..\..\libxml2\lib\libxml2.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.

More information about the commits mailing list