diff --git a/win32/Makefile.am b/win32/Makefile.am index 7e5ab1c..0082742 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,5 +1,6 @@ AUTOMAKE_OPTIONS = 1.9 foreign -EXTRA_DIST = README.win32 ezstream.1.html ezstream.sln ezstream.vcproj +EXTRA_DIST = README.win32 config.h ezstream.1.html ezstream.sln \ + ezstream.vcproj CLEANFILES = core *.core *~ .*~ diff --git a/win32/README.win32 b/win32/README.win32 index e04078d..f7f5b02 100644 --- a/win32/README.win32 +++ b/win32/README.win32 @@ -15,11 +15,7 @@ README.win32 - Information about the binary Ezstream distribution for Windows | | automatically generated and looks very bad, | | | but should be readable enough to be useful. | +-----------------------+----------------------------------------------+ -| \bin\ezstream.exe | The ezstream executable file. | -+-----------------------+----------------------------------------------+ -| \bin\*.dll | .DLL libraries required by ezstream. These | -| | need to be located in the same directory as | -| | the ezstream.exe executable. | +| \ezstream.exe | The ezstream executable file. | +-----------------------+----------------------------------------------+ | \conf\*.xml | Ezstream example configuration files. | +-----------------------+----------------------------------------------+ @@ -33,11 +29,10 @@ README.win32 - Information about the binary Ezstream distribution for Windows As of version 0.3.0, ezstream no longer comes with an installer. If you have a previous version of ezstream installed, you might want to simply uninstall it. -The ezstream.exe file will simply work as long as libxml2.dll, iconv.dll and -zlib.dll are located in the same directory. - -To install ezstream, simply copy the contents of the \bin directory in this -archive to a location of your choosing. +The ezstream.exe file will work from any location. To install it, simply copy +it to a location of your choosing. Add this place to your PATH environment +variable, if ezstream.exe is supposed to be executable from anywhere on the +system. @@ -47,9 +42,7 @@ archive to a location of your choosing. Ezstream uses libxml2 (http://xmlsoft.org/, BSD-like license), libogg and libvorbis (http://www.vorbis.com/, BSD-like license) and libshout -(http://www.icecast.org/, LGPL licensed). Also, libxml2 depends on zlib -(http://zlib.net/, BSD-like license) and libiconv -(http://www.gnu.org/software/libiconv/, LGPL licensed.) +(http://www.icecast.org/, LGPL licensed). Ezstream itself is licensed under the GPL (see COPYING.txt), with the source code available at http://www.icecast.org/ezstream.php in the distribution diff --git a/win32/config.h b/win32/config.h new file mode 100644 index 0000000..9f85ef8 --- /dev/null +++ b/win32/config.h @@ -0,0 +1,29 @@ +#define HAVE_INTTYPES_H 1 +#define HAVE_STAT 1 +#define HAVE_STDINT_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 + +/* Name of package */ +#define PACKAGE "ezstream" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "grmo@users.sourceforge.net" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ezstream" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "ezstream 0.3.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "ezstream" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.3.0" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "0.3.0" diff --git a/win32/ezstream.1.html b/win32/ezstream.1.html index db40b4c..c56df90 100644 --- a/win32/ezstream.1.html +++ b/win32/ezstream.1.html @@ -10,7 +10,7 @@ FILES
AUTHORS
- @@ -18,7 +18,7 @@

EZSTREAM ( 1 ) OpenBSD Reference Manual EZSTREAM ( 1 )

NAME

ezstream - source client for Icecast with external en-/decoder support

-

SYNOPSIS

ezstream [ -hqv ] [ -c configfile ]

+

SYNOPSIS

ezstream [ -hqVv ] [ -c configfile ]

DESCRIPTION

@@ -35,6 +35,7 @@ Use the XML configuration in configfile. ( Mandatory. )

-h Print a summary of available command line parameters with short descriptions and exit.

-q Be more quiet. Suppress the output that external programs send to standard error.

+

-V Print the ezstream version number and exit.

-v Produce more verbose output from ezstream. Use twice for even more verbose output.

When the -q and -v parameters are provided simultaneously, an additional line of information about the
currently streamed file -- playlist position, approximate playing time and bitrate -- is displayed.

diff --git a/win32/ezstream.sln b/win32/ezstream.sln index 4182958..7eb65ca 100644 --- a/win32/ezstream.sln +++ b/win32/ezstream.sln @@ -32,6 +32,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj ProjectSection(ProjectDependencies) = postProject {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} {376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6} + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1} = {3E590C94-A4E0-4E79-839E-A7263F3CA6B1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\libxml2\win32\VC7\libxml2.vcproj", "{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}" + ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global @@ -168,6 +173,26 @@ Global {4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB Release.Build.0 = Release|Win32 {4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.ActiveCfg = Release|Win32 {4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.Build.0 = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.ActiveCfg = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.Build.0 = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Debug.ActiveCfg = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Debug.Build.0 = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Release.ActiveCfg = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Release.Build.0 = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Debug.ActiveCfg = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Debug.Build.0 = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Release.ActiveCfg = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Release.Build.0 = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Debug.ActiveCfg = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Debug.Build.0 = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Release.ActiveCfg = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Release.Build.0 = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Debug.ActiveCfg = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Debug.Build.0 = Debug|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Release.ActiveCfg = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Release.Build.0 = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.ActiveCfg = Release|Win32 + {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/win32/ezstream.vcproj b/win32/ezstream.vcproj index 0ee2582..de5e036 100644 --- a/win32/ezstream.vcproj +++ b/win32/ezstream.vcproj @@ -23,8 +23,8 @@ 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" + AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;." + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H" StringPooling="TRUE" ExceptionHandling="FALSE" BasicRuntimeChecks="0" @@ -43,11 +43,11 @@ Name="VCCustomBuildTool"/> + +