MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-12 15:33:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix win32 library loading issues.

Browse Source
This commit is contained in:
Ron Pedde 2007-09-07 07:51:00 +00:00
parent effab02bc1
commit 9d9ce5ba7a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -221,9 +221,9 @@ int load_plugin_dir(char *plugindir) {
} else { } else {
while((readdir_r(d_plugin,(struct dirent *)de,&pde) != 1) && pde) { while((readdir_r(d_plugin,(struct dirent *)de,&pde) != 1) && pde) {
pext = strrchr(pde->d_name,'.'); pext = strrchr(pde->d_name,'.');
if((strcasecmp(pext,".so") == 0) || if((pext) && ((strcasecmp(pext,".so") == 0) ||
(strcasecmp(pext,".dylib") == 0) || (strcasecmp(pext,".dylib") == 0) ||
(strcasecmp(pext,".dll") == 0)) { (strcasecmp(pext,".dll") == 0))) {
/* must be a plugin */ /* must be a plugin */
snprintf(plugin,PATH_MAX,"%s%c%s",plugindir, snprintf(plugin,PATH_MAX,"%s%c%s",plugindir,
PATHSEP,pde->d_name); PATHSEP,pde->d_name);

6
win32/mt-daapd.vcproj
View File

@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mt-daapd" Name="firefly"
ProjectGUID="{CB40C666-11D7-456B-B774-BCA42F675BB5}" ProjectGUID="{CB40C666-11D7-456B-B774-BCA42F675BB5}"
RootNamespace="mt-daapd" RootNamespace="mt-daapd"
Keyword="Win32Proj" Keyword="Win32Proj"
@ -64,7 +64,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib ws2_32.lib sqlite3.lib sqlite.lib dnssd.lib libFLAC.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib iconv.lib" AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib ws2_32.lib sqlite3.lib sqlite.lib dnssd.lib libFLAC.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib iconv.lib"
OutputFile="$(OutDir)/mt-daapd.exe" OutputFile="$(OutDir)/firefly.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
@ -145,7 +145,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib ws2_32.lib sqlite3.lib sqlite.lib dnssd.lib libFLAC.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib iconv.lib" AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib ws2_32.lib sqlite3.lib sqlite.lib dnssd.lib libFLAC.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib iconv.lib"
OutputFile="$(OutDir)/mt-daapd.exe" OutputFile="$(OutDir)/firefly.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"

6
win32/nsi/mt-daapd.nsi.templ
View File

@ -169,7 +169,7 @@ HasProgramItems:
NoProgramItems: NoProgramItems:
SetOverwrite on SetOverwrite on
File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe" File "${MTD_SOURCE}\firefly.exe"
File "${CONFIG_SOURCE}\FireflyShell.exe" File "${CONFIG_SOURCE}\FireflyShell.exe"
Delete "$2\FireflyShell.exe.manifest" Delete "$2\FireflyShell.exe.manifest"
File "${CONFIG_SOURCE}\FireflyShell-0c.dll" File "${CONFIG_SOURCE}\FireflyShell-0c.dll"
@ -338,7 +338,7 @@ SectionEnd
Section -Post Section -Post
WriteUninstaller "$2\uninst.exe" WriteUninstaller "$2\uninst.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$2\mt-daapd.exe" WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$2\firefly.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$2\uninst.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$2\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$2\firefly.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$2\firefly.exe"
@ -355,7 +355,7 @@ Section -Post
IfErrors 0 +2 ; Skip the write if we have the /N option IfErrors 0 +2 ; Skip the write if we have the /N option
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q' WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q'
; ExecWait "$2\mt-daapd.exe -i" ; ExecWait "$2\firefly.exe -i"
nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\firefly.exe" "" "Bonjour Service" "" "" nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\firefly.exe" "" "Bonjour Service" "" ""
Pop $0 Pop $0