kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build mod_perl and fs_perl correctly on windows. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@765 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-03-06 20:35:23 +00:00
parent 49fa317298
commit 6ad4c8a9d5
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/languages/mod_perl/fs_perl.vcproj
View File

@ -24,7 +24,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@ -63,7 +63,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:xs_init"
OutputFile="$(OutDir)\Perl\$(ProjectName).dll"
LinkIncremental="2"
GenerateDebugInformation="true"
@ -106,7 +105,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@ -142,7 +141,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:xs_init"
OutputFile="$(OutDir)\Perl\$(ProjectName).dll"
LinkIncremental="1"
GenerateDebugInformation="true"
@ -186,10 +184,6 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\perlxsi.c"
>
</File>
<File
RelativePath=".\switch_swig.c"
>

8
src/mod/languages/mod_perl/mod_perl.vcproj
View File

@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_perl Debug"
CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"
/>
<Tool
Name="VCCustomBuildTool"
@ -109,7 +109,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_perl Release"
CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"
/>
<Tool
Name="VCCustomBuildTool"
@ -195,6 +195,10 @@
RelativePath=".\mod_perl.c"
>
</File>
<File
RelativePath=".\perlxsi.c"
>
</File>
</Filter>
<Filter
Name="Header Files"

18
src/switch_loadable_module.c
View File

@ -316,15 +316,15 @@ static void switch_loadable_module_path_init()
char *path =NULL, *working =NULL;
apr_dir_t *perl_dir_handle = NULL;
apr_env_get(&path, "path", loadable_modules.pool);
apr_filepath_get(&working, APR_FILEPATH_NATIVE , loadable_modules.pool);
apr_env_get(&path, "path", loadable_modules.pool);
apr_filepath_get(&working, APR_FILEPATH_NATIVE , loadable_modules.pool);
if (apr_dir_open(&perl_dir_handle, ".\\perl", loadable_modules.pool) == APR_SUCCESS) {
apr_dir_close(perl_dir_handle);
apr_env_set("path",
apr_pstrcat(loadable_modules.pool, path, ";", working, "\\perl", NULL),
loadable_modules.pool);
}
if (apr_dir_open(&perl_dir_handle, ".\\perl", loadable_modules.pool) == APR_SUCCESS) {
apr_dir_close(perl_dir_handle);
apr_env_set("path",
apr_pstrcat(loadable_modules.pool, path, ";", working, "\\perl", NULL),
loadable_modules.pool);
}
}
#endif
@ -357,7 +357,7 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
#ifdef WIN32
switch_loadable_module_path_init();
switch_loadable_module_path_init();
#endif
switch_core_hash_init(&loadable_modules.module_hash, loadable_modules.pool);

3
w32/vsnet/Freeswitch.sln
View File

@ -151,8 +151,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
ProjectSection(ProjectDependencies) = postProject
{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"
@ -169,7 +169,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fs_perl", "..\..\src\mod\la
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_perl", "..\..\src\mod\languages\mod_perl\mod_perl.vcproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"
ProjectSection(ProjectDependencies) = postProject
{B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
EndProjectSection
EndProject