[xiph-commits] r12615 - in trunk/ezstream: src win32
moritz at svn.xiph.org
moritz at svn.xiph.org
Sat Mar 3 08:13:14 PST 2007
Author: moritz
Date: 2007-03-03 08:13:08 -0800 (Sat, 03 Mar 2007)
New Revision: 12615
Added:
trunk/ezstream/src/compat.h
trunk/ezstream/win32/ezstream.sln
trunk/ezstream/win32/ezstream.vcproj
Removed:
trunk/ezstream/win32/ezstream.dsp
trunk/ezstream/win32/ezstream.dsw
trunk/ezstream/win32/ezstream.iss
Modified:
trunk/ezstream/src/Makefile.am
trunk/ezstream/src/ezstream.c
trunk/ezstream/src/playlist.c
trunk/ezstream/win32/Makefile.am
Log:
Iterate back towards working Windows support.
Modified: trunk/ezstream/src/Makefile.am
===================================================================
--- trunk/ezstream/src/Makefile.am 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/src/Makefile.am 2007-03-03 16:13:08 UTC (rev 12615)
@@ -8,6 +8,6 @@
AM_CFLAGS = @XIPH_CFLAGS@
AM_CPPFLAGS = @XIPH_CPPFLAGS@
-EXTRA_DIST = configfile.h getopt.h playlist.h strfctns.h util.h
+EXTRA_DIST = compat.h configfile.h getopt.h playlist.h strfctns.h util.h
CLEANFILES = core *.core *~ .*~
Added: trunk/ezstream/src/compat.h
===================================================================
--- trunk/ezstream/src/compat.h 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/src/compat.h 2007-03-03 16:13:08 UTC (rev 12615)
@@ -0,0 +1,41 @@
+#ifndef __COMPAT_H__
+#define __COMPAT_H__
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifndef PATH_SEPARATOR
+# ifdef WIN32
+# define PATH_SEPARATOR '\\'
+# else
+# define PATH_SEPARATOR '/'
+# endif /* WIN32 */
+#endif /* !PATH_SEPARATOR */
+
+#ifdef WIN32
+
+# define _PATH_DEVNULL "nul"
+
+# define strncasecmp strnicmp
+# define popen _popen
+# define pclose _pclose
+# define snprintf _snprintf
+# define stat _stat
+
+# define S_IXGRP 0
+# define S_IXOTH 0
+# define S_IWGRP 0
+# define S_IWOTH 0
+# define S_IRGRP 0
+# define S_IROTH 0
+
+#else
+
+# ifndef S_IEXEC
+# define S_IEXEC S_IXUSR
+# endif
+
+#endif /* WIN32 */
+
+#endif /* __COMPAT_H__ */
Modified: trunk/ezstream/src/ezstream.c
===================================================================
--- trunk/ezstream/src/ezstream.c 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/src/ezstream.c 2007-03-03 16:13:08 UTC (rev 12615)
@@ -54,10 +54,11 @@
#include <shout/shout.h>
#include <vorbis/vorbisfile.h>
+#include "compat.h"
+#include "configfile.h"
#ifndef HAVE_GETOPT
# include "getopt.h"
#endif
-#include "configfile.h"
#include "playlist.h"
#include "strfctns.h"
#include "util.h"
@@ -71,16 +72,6 @@
# define _PATH_DEVNULL "/dev/null"
#endif /* _PATH_DEVNULL */
-#ifdef WIN32
-# define STRNCASECMP strnicmp
-# define popen _popen
-# define pclose _pclose
-# define snprintf _snprintf
-# define stat _stat
-#else
-# define STRNCASECMP strncasecmp
-#endif /* WIN32 */
-
#define STREAM_DONE 0
#define STREAM_CONT 1
#define STREAM_SKIP 2
@@ -420,10 +411,10 @@
while(*ptr){
if (artist == NULL &&
- STRNCASECMP(*ptr, "ARTIST", strlen("ARTIST")) == 0)
+ strncasecmp(*ptr, "ARTIST", strlen("ARTIST")) == 0)
artist = xstrdup(*ptr + strlen("ARTIST="));
if (title == NULL &&
- STRNCASECMP(*ptr, "TITLE", strlen("TITLE")) == 0)
+ strncasecmp(*ptr, "TITLE", strlen("TITLE")) == 0)
title = xstrdup(*ptr + strlen("TITLE="));
++ptr;
}
@@ -878,7 +869,7 @@
if (argv0 == NULL)
return ((char *)"ezstream");
- p = strrchr(argv0, '/');
+ p = strrchr(argv0, PATH_SEPARATOR);
if (p == NULL)
p = (char *)argv0;
else
Modified: trunk/ezstream/src/playlist.c
===================================================================
--- trunk/ezstream/src/playlist.c 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/src/playlist.c 2007-03-03 16:13:08 UTC (rev 12615)
@@ -31,16 +31,10 @@
#include <string.h>
#include <time.h>
+#include "compat.h"
#include "playlist.h"
#include "util.h"
-#ifdef WIN32
-# define snprintf _snprintf
-# define popen _popen
-# define pclose _pclose
-# define stat _stat
-#endif
-
#ifndef SIZE_T_MAX
# define SIZE_T_MAX UINT_MAX
#endif
@@ -239,7 +233,7 @@
playlist_free(pl);
return (NULL);
}
- if (!(st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) {
+ if (!(st.st_mode & (S_IEXEC | S_IXGRP | S_IXOTH))) {
printf("%s: %s: Not an executable program\n", __progname, filename);
playlist_free(pl);
return (NULL);
Modified: trunk/ezstream/win32/Makefile.am
===================================================================
--- trunk/ezstream/win32/Makefile.am 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/win32/Makefile.am 2007-03-03 16:13:08 UTC (rev 12615)
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = 1.9 foreign
-EXTRA_DIST = ezstream.dsp ezstream.dsw ezstream.iss
+EXTRA_DIST = ezstream.sln ezstream.vcproj
CLEANFILES = core *.core *~ .*~
Deleted: trunk/ezstream/win32/ezstream.dsp
===================================================================
--- trunk/ezstream/win32/ezstream.dsp 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/win32/ezstream.dsp 2007-03-03 16:13:08 UTC (rev 12615)
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ezstream" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ezstream - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ezstream.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ezstream.mak" CFG="ezstream - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ezstream - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ezstream - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ezstream - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 "../../ogg/include" /I "../../vorbis/include" /I "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# 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 ..\..\libshout\win32\Release\libshout.lib ogg_static.lib vorbis_static.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static.lib /nologo /subsystem:console /machine:I386 /libpath:"../../oggvorbis-win32sdk-1.0.1/lib" /libpath:"../../libshout-2.0/win32/Release" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib" /libpath:"../../ogg/win32/Static_Release" /libpath:"../../vorbis/win32/Vorbis_Static_Release" /libpath:"../../vorbis/win32/VorbisFile_Static_Release"
-
-!ELSEIF "$(CFG)" == "ezstream - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 "../../ogg/include" /I "../../vorbis/include" /I "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# 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 /debug /machine:I386 /pdbtype:sept
-# 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 ..\..\libshout\win32\Debug\libshout.lib ogg_static_d.lib vorbis_static_d.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../libshout-2.0/win32/Debug" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib" /libpath:"../../ogg/win32/Static_Debug" /libpath:"../../vorbis/win32/Vorbis_Static_Debug" /libpath:"../../vorbis/win32/VorbisFile_Static_Debug"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ezstream - Win32 Release"
-# Name "ezstream - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\src\configfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\configfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\ezstream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\getopt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\src\getopt.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
Deleted: trunk/ezstream/win32/ezstream.dsw
===================================================================
--- trunk/ezstream/win32/ezstream.dsw 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/win32/ezstream.dsw 2007-03-03 16:13:08 UTC (rev 12615)
@@ -1,89 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ezstream"=.\ezstream.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libshout
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name ogg_static
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name vorbis_static
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name vorbisfile_static
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libshout"=..\..\libshout\win32\libshout.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ogg_static"=..\..\ogg\win32\ogg_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "vorbis_static"=..\..\vorbis\win32\vorbis_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "vorbisfile_static"=..\..\vorbis\win32\vorbisfile_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Deleted: trunk/ezstream/win32/ezstream.iss
===================================================================
--- trunk/ezstream/win32/ezstream.iss 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/win32/ezstream.iss 2007-03-03 16:13:08 UTC (rev 12615)
@@ -1,41 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-AppName=ezstream
-AppVerName=ezstream v0.2.1
-AppPublisherURL=http://www.icecast.org
-AppSupportURL=http://www.icecast.org
-AppUpdatesURL=http://www.icecast.org
-DefaultDirName={pf}\ezstream
-DefaultGroupName=ezstream
-AllowNoIcons=yes
-LicenseFile=..\COPYING
-InfoAfterFile=..\README
-OutputDir=.
-OutputBaseFilename=ezstream_win32_0.2.1_setup
-; uncomment the following line if you want your installation to run on NT 3.51 too.
-; MinVersion=4,3.51
-
-[Tasks]
-Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4
-
-[Dirs]
-Name: "{app}"
-
-
-[Files]
-Source: "Release\ezstream.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\pthreads\pthreadVSE.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\conf\ezstream_mp3.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\conf\ezstream_vorbis.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\conf\ezstream_reencoding_example_mp3.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\conf\ezstream_reencoding_example_vorbis.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\conf\ezstream_reencoding_example_theora.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\iconv\lib\iconv.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\libxml2\lib\libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-[Icons]
-
-[Run]
-
Added: trunk/ezstream/win32/ezstream.sln
===================================================================
--- trunk/ezstream/win32/ezstream.sln 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/win32/ezstream.sln 2007-03-03 16:13:08 UTC (rev 12615)
@@ -0,0 +1,72 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg_static", "..\..\ogg\win32\ogg_static.vcproj", "{A0144DD0-0064-46CF-93D3-78DB712034D4}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis_static", "..\..\vorbis\win32\vorbis_static.vcproj", "{FB2ECA7B-D98C-4341-84B7-005E037E25A7}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisfile_static", "..\..\vorbis\win32\vorbisfile_static.vcproj", "{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theora_static", "..\..\theora\win32\theora_static.vcproj", "{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
+ {A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\shout\win32\libshout.vcproj", "{376BDB5E-7092-44EC-AF16-C087D2D80FC6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
+ {63A539B9-C6CD-4DC9-80B2-B28DB92C151E} = {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}
+ {A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj", "{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
+ {376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.ActiveCfg = Debug|Win32
+ {A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.Build.0 = Debug|Win32
+ {A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.ActiveCfg = Release|Win32
+ {A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.Build.0 = Release|Win32
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.ActiveCfg = Debug|Win32
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.Build.0 = Debug|Win32
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.ActiveCfg = Release|Win32
+ {FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.Build.0 = Release|Win32
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.ActiveCfg = Debug|Win32
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.Build.0 = Debug|Win32
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.ActiveCfg = Release|Win32
+ {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.Build.0 = Release|Win32
+ {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.ActiveCfg = Debug|Win32
+ {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.Build.0 = Debug|Win32
+ {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.ActiveCfg = Release|Win32
+ {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.Build.0 = Release|Win32
+ {376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.ActiveCfg = Debug|Win32
+ {376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.Build.0 = Debug|Win32
+ {376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.ActiveCfg = Release|Win32
+ {376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.Build.0 = Release|Win32
+ {4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.ActiveCfg = Debug|Win32
+ {4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.Build.0 = Debug|Win32
+ {4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.ActiveCfg = Release|Win32
+ {4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Added: trunk/ezstream/win32/ezstream.vcproj
===================================================================
--- trunk/ezstream/win32/ezstream.vcproj 2007-03-03 12:42:50 UTC (rev 12614)
+++ trunk/ezstream/win32/ezstream.vcproj 2007-03-03 16:13:08 UTC (rev 12615)
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="ezstream"
+ ProjectGUID="{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="1"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../ogg/include,../../vorbis/include,../../shout/include,../src,../../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_SYS_TYPES_H;HAVE_SYS_STAT_H;HAVE_STAT"
+ StringPooling="TRUE"
+ ExceptionHandling="FALSE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="FALSE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/ezstream.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\shout\win32\Release\libshout.lib ogg_static.lib vorbis_static.lib pthreadVC2.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static.lib"
+ OutputFile=".\Release/ezstream.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../../theora/win32/Static_Release,../../shout/win32/Static_Release,../../../lib,../../ogg/win32/Static_Release,../../vorbis/win32/Vorbis_Static_Release,../../vorbis/win32/VorbisFile_Static_Release"
+ IgnoreDefaultLibraryNames="libc.lib;msvcrt.lib;libcd.lib;libcmtd.lib;msvcrtd.lib"
+ ProgramDatabaseFile=".\Release/ezstream.pdb"
+ SubSystem="1"
+ SetChecksum="TRUE"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/ezstream.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="1"
+ UseOfMFC="1"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../ogg/include,../../vorbis/include,../../shout/include,../src,../../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_SYS_TYPES_H;HAVE_SYS_STAT_H;HAVE_STAT"
+ ExceptionHandling="FALSE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/ezstream.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib libshout.lib ogg_static_d.lib vorbis_static_d.lib pthreadVC2.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static_d.lib"
+ OutputFile=".\Debug/ezstream.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../../shout/win32/Debug,../../../lib,../../ogg/win32/Static_Debug,../../vorbis/win32/Vorbis_Static_Debug,../../vorbis/win32/VorbisFile_Static_Debug"
+ IgnoreAllDefaultLibraries="FALSE"
+ IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;msvcrtd.lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\Debug/ezstream.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/ezstream.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath="..\src\configfile.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\ezstream.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\getopt.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\playlist.c">
+ </File>
+ <File
+ RelativePath="..\src\strlcat.c">
+ </File>
+ <File
+ RelativePath="..\src\strlcpy.c">
+ </File>
+ <File
+ RelativePath="..\src\strtonum.c">
+ </File>
+ <File
+ RelativePath="..\src\util.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath="..\src\compat.h">
+ </File>
+ <File
+ RelativePath="..\src\configfile.h">
+ </File>
+ <File
+ RelativePath="..\src\getopt.h">
+ </File>
+ <File
+ RelativePath="..\src\playlist.h">
+ </File>
+ <File
+ RelativePath="..\src\strfctns.h">
+ </File>
+ <File
+ RelativePath="..\src\util.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
More information about the commits
mailing list