diff --git a/src/configfile.c b/src/configfile.c index af248e7..f7c390b 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -354,9 +354,9 @@ int parseConfig(char *fileName) } } if (!xmlStrcmp(cur2->name, (const xmlChar *) "encdec")) { + xmlNodePtr cur3; FORMAT_ENCDEC *pformatEncDec = malloc(sizeof(FORMAT_ENCDEC)); memset(pformatEncDec, '\000', sizeof(FORMAT_ENCDEC)); - xmlNodePtr cur3; cur3 = cur2->xmlChildrenNode; while (cur3 != NULL) { if (!xmlStrcmp(cur3->name, (const xmlChar *) "format")) { diff --git a/win32/ezstream.dsp b/win32/ezstream.dsp index 2ffa832..5481db1 100644 --- a/win32/ezstream.dsp +++ b/win32/ezstream.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 "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../oggvorbis-win32sdk-1.0.1/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 @@ -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 ..\..\libshout\win32\Release\libshout.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\vorbis_static.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib /nologo /subsystem:console /machine:I386 /libpath:"../../libshout-2.0/win32/Release" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib" +# 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 ..\..\oggvorbis-win32sdk-1.0.1\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\vorbis_static.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile.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" !ELSEIF "$(CFG)" == "ezstream - Win32 Debug" diff --git a/win32/ezstream.iss b/win32/ezstream.iss index d33abce..2a2a6df 100644 --- a/win32/ezstream.iss +++ b/win32/ezstream.iss @@ -30,8 +30,12 @@ Source: "..\..\pthreads\pthreadVSE.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\conf\ezstream_mp3.xml"; DestDir: "{app}"; Flags: ignoreversion Source: "..\conf\ezstream_m3u.xml"; DestDir: "{app}"; Flags: ignoreversion Source: "..\conf\ezstream_vorbis.xml"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\conf\ezstream_reencoding_example.xml"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\iconv\lib\iconv.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\libxml2\lib\libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\oggvorbis-win32sdk-1.0.1\bin\vorbisfile.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\oggvorbis-win32sdk-1.0.1\bin\ogg.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\oggvorbis-win32sdk-1.0.1\bin\vorbis.dll"; DestDir: "{app}"; Flags: ignoreversion [Icons]