From c0598144d962fbc8c20482bdc5e00e99ec62f8a9 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Thu, 16 Mar 2006 14:24:26 +0000 Subject: Added misc flags and modify Makefiles to allow exclusion of PortAudio and specific codec during compilation git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@320 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/build/Makefile | 22 ++++++++++++++++++++-- pjsip-apps/build/pjsip_apps.dsw | 9 +++------ pjsip-apps/build/pjsip_perf.dsp | 2 +- pjsip-apps/build/pjsua.dsp | 2 +- 4 files changed, 25 insertions(+), 10 deletions(-) (limited to 'pjsip-apps') diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index 826cad05..44a41d97 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -44,12 +44,24 @@ export PJSUA_EXE:=../bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) +############################################################################### +# Defines for building PJSIP-PERF +# +export PJSIPPERF_SRCDIR = ../src/pjsip-perf +export PJSIPPERF_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ + handler_call.o handler_options.o main.o +export PJSIPPERF_CFLAGS += $(_CFLAGS) +export PJSIPPERF_LDFLAGS += $(_LDFLAGS) +export PJSIPPERF_EXE:=../bin/pjsip-perf-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) + + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT ############################################################################### # Main entry # # -TARGETS := pjsua +TARGETS := pjsua pjsip-perf .PHONY: $(TARGETS) @@ -66,14 +78,20 @@ distclean: realclean pjsua: $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE) +pjsip-perf: + $(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $(PJSUA_EXE) + + .PHONY: ../lib/pjsua.ko ../lib/pjsua.ko: $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@ clean depend realclean: $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@ + $(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $@ @if test "$@" == "depend"; then \ - echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ + echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ + echo '$(PJSIPPERF_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsip-perf-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ fi diff --git a/pjsip-apps/build/pjsip_apps.dsw b/pjsip-apps/build/pjsip_apps.dsw index 8b95ede8..21645077 100644 --- a/pjsip-apps/build/pjsip_apps.dsw +++ b/pjsip-apps/build/pjsip_apps.dsw @@ -78,12 +78,6 @@ Package=<4> Project_Dep_Name pjlib_util End Project Dependency Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_codec - End Project Dependency - Begin Project Dependency Project_Dep_Name pjsip_core End Project Dependency Begin Project Dependency @@ -95,6 +89,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name pjsua_lib End Project Dependency + Begin Project Dependency + Project_Dep_Name pjmedia + End Project Dependency }}} ############################################################################### diff --git a/pjsip-apps/build/pjsip_perf.dsp b/pjsip-apps/build/pjsip_perf.dsp index 1d4c4c2a..c6402062 100644 --- a/pjsip-apps/build/pjsip_perf.dsp +++ b/pjsip-apps/build/pjsip_perf.dsp @@ -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 ole32.lib user32.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\pjsip-perf-i386-win32-vc6d.exe" +# ADD LINK32 ole32.lib user32.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\pjsip-perf-i386-win32-vc6.exe" !ELSEIF "$(CFG)" == "pjsip_perf - Win32 Debug" diff --git a/pjsip-apps/build/pjsua.dsp b/pjsip-apps/build/pjsua.dsp index 8e80b355..2d92582e 100644 --- a/pjsip-apps/build/pjsua.dsp +++ b/pjsip-apps/build/pjsua.dsp @@ -51,7 +51,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 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386 /out:"../bin/pjsua_vc6.exe" /fixed:no +# ADD LINK32 ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map:"..\bin\pjsua_vc6.map" /machine:I386 /out:"../bin/pjsua_vc6.exe" /fixed:no # SUBTRACT LINK32 /pdb:none /debug !ELSEIF "$(CFG)" == "pjsua - Win32 Debug" -- cgit v1.2.3