From ce0bd79277c8acfd23e0d130a5ef0554908b953a Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 6 Mar 2006 00:02:45 +0000 Subject: [PATCH] mod_perl build on windows. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@755 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_platform.h | 2 + src/mod/languages/mod_perl/fs_perl.vcproj | 32 ++- src/mod/languages/mod_perl/mod_perl.c | 8 +- src/mod/languages/mod_perl/mod_perl.vcproj | 214 +++++++++++++++++++++ src/mod/languages/mod_perl/perlibs.h | 2 +- w32/vsnet/Freeswitch.sln | 14 ++ 6 files changed, 264 insertions(+), 8 deletions(-) create mode 100644 src/mod/languages/mod_perl/mod_perl.vcproj diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h index 4b99a680a7..093ada3772 100644 --- a/src/include/switch_platform.h +++ b/src/include/switch_platform.h @@ -78,10 +78,12 @@ typedef unsigned long in_addr_t; #endif #define PACKED #include +#ifndef WIN32IOP_H //macro collision with perl #define write _write #define open _open #define close _close #define read _read +#endif #else /* packed attribute */ #ifndef PACKED diff --git a/src/mod/languages/mod_perl/fs_perl.vcproj b/src/mod/languages/mod_perl/fs_perl.vcproj index ed6b53a6a5..36d6f47606 100644 --- a/src/mod/languages/mod_perl/fs_perl.vcproj +++ b/src/mod/languages/mod_perl/fs_perl.vcproj @@ -24,6 +24,7 @@ > @@ -193,6 +197,22 @@ + + + + + + + +#ifdef _MSC_VER +#include +#pragma comment(lib, PERL_LIB) +#endif + #include #include +#include static char *embedding[] = { "", "-e", "" }; EXTERN_C void xs_init(pTHX); diff --git a/src/mod/languages/mod_perl/mod_perl.vcproj b/src/mod/languages/mod_perl/mod_perl.vcproj new file mode 100644 index 0000000000..0faec3563f --- /dev/null +++ b/src/mod/languages/mod_perl/mod_perl.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mod/languages/mod_perl/perlibs.h b/src/mod/languages/mod_perl/perlibs.h index 2460b3cba6..41f26ed7e6 100644 --- a/src/mod/languages/mod_perl/perlibs.h +++ b/src/mod/languages/mod_perl/perlibs.h @@ -1 +1 @@ -#define PERL_LIB "C:\perl\lib\CORE\perl58.lib" +#define PERL_LIB "C:\\perl\\lib\\CORE\\perl58.lib" diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln index b07a8ad28f..7781a50609 100644 --- a/w32/vsnet/Freeswitch.sln +++ b/w32/vsnet/Freeswitch.sln @@ -163,6 +163,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "..\..\src\m EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fs_perl", "..\..\src\mod\languages\mod_perl\fs_perl.vcproj", "{B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +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 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -286,6 +295,10 @@ Global {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8}.Debug|Win32.Build.0 = Debug|Win32 {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8}.Release|Win32.ActiveCfg = Release|Win32 {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8}.Release|Win32.Build.0 = Release|Win32 + {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|Win32.Build.0 = Debug|Win32 + {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.ActiveCfg = Release|Win32 + {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -316,6 +329,7 @@ Global {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000} {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} EndGlobalSection EndGlobal