Moved pjsua framework to pjsua-lib

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@238 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2006-02-27 00:00:30 +00:00
parent 5b5badf17d
commit 4f9f64e346
13 changed files with 157 additions and 160 deletions

View File

@ -137,6 +137,21 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name pjsip_simple
End Project Dependency
Begin Project Dependency
Project_Dep_Name pjsua_lib
End Project Dependency
}}}
###############################################################################
Project: "pjsua_lib"=.\pjsua_lib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

View File

@ -1,117 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsip_core_lib", "pjsip_core.vcproj", "{6A2C9762-EB5C-44B3-BC41-471DA2D0234A}"
ProjectSection(ProjectDependencies) = postProject
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78} = {A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsip_ua_lib", "pjsip_ua.vcproj", "{B05FA649-6AD8-42E3-986D-C6E95E206B76}"
ProjectSection(ProjectDependencies) = postProject
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A} = {6A2C9762-EB5C-44B3-BC41-471DA2D0234A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "..\..\pjlib\build\pjlib.vcproj", "{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjmedia_lib", "..\..\pjmedia\build\pjmedia.vcproj", "{99D06BCE-43AE-40B6-AD4F-14261AB7C5D9}"
ProjectSection(ProjectDependencies) = postProject
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78} = {A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua", "pjsua.vcproj", "{DBEC405B-6E6E-419E-BE29-FF6AFC8FEC70}"
ProjectSection(ProjectDependencies) = postProject
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78} = {A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}
{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE} = {B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}
{B05FA649-6AD8-42E3-986D-C6E95E206B76} = {B05FA649-6AD8-42E3-986D-C6E95E206B76}
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A} = {6A2C9762-EB5C-44B3-BC41-471DA2D0234A}
{99D06BCE-43AE-40B6-AD4F-14261AB7C5D9} = {99D06BCE-43AE-40B6-AD4F-14261AB7C5D9}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsip_core_test", "pjsip_core_test.vcproj", "{782BF0C1-FE0E-48A9-B875-31E7BF9F4B5B}"
ProjectSection(ProjectDependencies) = postProject
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78} = {A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A} = {6A2C9762-EB5C-44B3-BC41-471DA2D0234A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsip_simple_lib", "pjsip_simple.vcproj", "{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SourceCodeControl) = preSolution
SccNumberOfProjects = 8
SccProjectName0 = \u0022$/pjproject\u0022,\u0020PIAAAAAA
SccLocalPath0 = ..\\..
SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection0 = pjsip\\build\\
SolutionUniqueID = {084A6F63-C2AA-4AF1-B551-6F4550ACB44F}
SccProjectUniqueName1 = ..\\..\\pjlib\\build\\pjlib.vcproj
SccLocalPath1 = ..\\..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection1 = pjlib\\build\\
SccProjectUniqueName2 = ..\\..\\pjmedia\\build\\pjmedia.vcproj
SccLocalPath2 = ..\\..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection2 = pjmedia\\build\\
SccProjectUniqueName3 = pjsip_core.vcproj
SccLocalPath3 = ..\\..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection3 = pjsip\\build\\
SccProjectUniqueName4 = pjsip_ua.vcproj
SccLocalPath4 = ..\\..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection4 = pjsip\\build\\
SccProjectUniqueName5 = pjsua.vcproj
SccLocalPath5 = ..\\..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection5 = pjsip\\build\\
SccProjectUniqueName6 = pjsip_core_test.vcproj
SccLocalPath6 = ..\\..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection6 = pjsip\\build\\
SccProjectUniqueName7 = pjsip_simple.vcproj
SccProjectName7 = \u0022$/pjproject/pjsip\u0022,\u0020QIAAAAAA
SccLocalPath7 = ..
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection7 = build\\
EndGlobalSection
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A}.Debug.ActiveCfg = Debug|Win32
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A}.Debug.Build.0 = Debug|Win32
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A}.Release.ActiveCfg = Release|Win32
{6A2C9762-EB5C-44B3-BC41-471DA2D0234A}.Release.Build.0 = Release|Win32
{B05FA649-6AD8-42E3-986D-C6E95E206B76}.Debug.ActiveCfg = Debug|Win32
{B05FA649-6AD8-42E3-986D-C6E95E206B76}.Debug.Build.0 = Debug|Win32
{B05FA649-6AD8-42E3-986D-C6E95E206B76}.Release.ActiveCfg = Release|Win32
{B05FA649-6AD8-42E3-986D-C6E95E206B76}.Release.Build.0 = Release|Win32
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}.Debug.ActiveCfg = Debug|Win32
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}.Debug.Build.0 = Debug|Win32
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}.Release.ActiveCfg = Release|Win32
{A0EC3D31-5FC2-45A5-85FB-76376FBBBD78}.Release.Build.0 = Release|Win32
{99D06BCE-43AE-40B6-AD4F-14261AB7C5D9}.Debug.ActiveCfg = Debug|Win32
{99D06BCE-43AE-40B6-AD4F-14261AB7C5D9}.Debug.Build.0 = Debug|Win32
{99D06BCE-43AE-40B6-AD4F-14261AB7C5D9}.Release.ActiveCfg = Release|Win32
{99D06BCE-43AE-40B6-AD4F-14261AB7C5D9}.Release.Build.0 = Release|Win32
{DBEC405B-6E6E-419E-BE29-FF6AFC8FEC70}.Debug.ActiveCfg = Debug|Win32
{DBEC405B-6E6E-419E-BE29-FF6AFC8FEC70}.Debug.Build.0 = Debug|Win32
{DBEC405B-6E6E-419E-BE29-FF6AFC8FEC70}.Release.ActiveCfg = Release|Win32
{DBEC405B-6E6E-419E-BE29-FF6AFC8FEC70}.Release.Build.0 = Release|Win32
{782BF0C1-FE0E-48A9-B875-31E7BF9F4B5B}.Debug.ActiveCfg = Debug|Win32
{782BF0C1-FE0E-48A9-B875-31E7BF9F4B5B}.Debug.Build.0 = Debug|Win32
{782BF0C1-FE0E-48A9-B875-31E7BF9F4B5B}.Release.ActiveCfg = Release|Win32
{782BF0C1-FE0E-48A9-B875-31E7BF9F4B5B}.Release.Build.0 = Release|Win32
{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}.Debug.ActiveCfg = Debug|Win32
{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}.Debug.Build.0 = Debug|Win32
{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}.Release.ActiveCfg = Release|Win32
{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

View File

@ -90,44 +90,12 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\src\pjsua\getopt.c
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\main.c
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\pjsua_call.c
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\pjsua_core.c
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\pjsua_opt.c
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\pjsua_pres.c
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\pjsua_reg.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\src\pjsua\getopt.h
# End Source File
# Begin Source File
SOURCE=..\src\pjsua\pjsua.h
# End Source File
# End Group
# Begin Group "Resource Files"

126
pjsip/build/pjsua_lib.dsp Normal file
View File

@ -0,0 +1,126 @@
# Microsoft Developer Studio Project File - Name="pjsua_lib" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=pjsua_lib - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "pjsua_lib.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "pjsua_lib.mak" CFG="pjsua_lib - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "pjsua_lib - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "pjsua_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "pjsua_lib - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir ".\output\pjsua-lib-i386-win32-vc6-release"
# PROP BASE Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\output\pjsua-lib-i386-win32-vc6-release"
# PROP Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W4 /GX /O2 /I "../include" /I "../../pjmedia/include" /I "../../pjlib-util/include" /I "../../pjlib/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\pjsua-lib-i386-win32-vc6-release.lib"
!ELSEIF "$(CFG)" == "pjsua_lib - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir ".\output\pjsua-lib-i386-win32-vc6-debug"
# PROP BASE Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\output\pjsua-lib-i386-win32-vc6-debug"
# PROP Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjmedia/include" /I "../../pjlib-util/include" /I "../../pjlib/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\pjsua-lib-i386-win32-vc6-debug.lib"
!ENDIF
# Begin Target
# Name "pjsua_lib - Win32 Release"
# Name "pjsua_lib - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE="..\src\pjsua-lib\getopt.c"
# End Source File
# Begin Source File
SOURCE="..\src\pjsua-lib\pjsua_call.c"
# End Source File
# Begin Source File
SOURCE="..\src\pjsua-lib\pjsua_core.c"
# End Source File
# Begin Source File
SOURCE="..\src\pjsua-lib\pjsua_opt.c"
# End Source File
# Begin Source File
SOURCE="..\src\pjsua-lib\pjsua_pres.c"
# End Source File
# Begin Source File
SOURCE="..\src\pjsua-lib\pjsua_reg.c"
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE="..\include\pjsua-lib\getopt.h"
# End Source File
# Begin Source File
SOURCE="..\include\pjsua-lib\pjsua.h"
# End Source File
# End Group
# End Target
# End Project

View File

@ -25,7 +25,7 @@
* $Id$
*/
#include "getopt.h"
#include <pjsua-lib/getopt.h>
#include <pj/string.h>
/* Internal only. Users should not call this directly. */

View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pjsua.h"
#include <pjsua-lib/pjsua.h>
#include <pj/log.h>

View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pjsua.h"
#include <pjsua-lib/pjsua.h>
/*
* pjsua_core.c

View File

@ -16,9 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pjsua.h"
#include "getopt.h"
#include <stdlib.h>
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/getopt.h>
#define THIS_FILE "pjsua_opt.c"
@ -191,6 +190,12 @@ static int read_config_file(pj_pool_t *pool, const char *filename,
}
static int my_atoi(const char *cs)
{
pj_str_t s;
return pj_strtoul(pj_cstr(&s, cs));
}
/* Parse arguments. */
pj_status_t pjsua_parse_args(int argc, char *argv[])
@ -458,7 +463,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
break;
case OPT_AUTO_ANSWER:
pjsua.auto_answer = atoi(optarg);
pjsua.auto_answer = my_atoi(optarg);
if (pjsua.auto_answer < 100 || pjsua.auto_answer > 699) {
puts("Error: invalid code in --auto-answer (expecting 100-699");
return -1;
@ -466,7 +471,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
break;
case OPT_MAX_CALLS:
pjsua.max_calls = atoi(optarg);
pjsua.max_calls = my_atoi(optarg);
if (pjsua.max_calls < 1 || pjsua.max_calls > 255) {
puts("Too many calls for max-calls (1-255)");
return -1;

View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pjsua.h"
#include <pjsua-lib/pjsua.h>
/*
* pjsua_pres.c

View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pjsua.h"
#include <pjsua-lib/pjsua.h>
/*

View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pjsua.h"
#include <pjsua-lib/pjsua.h>
#include <stdlib.h>