Changeset 4597


Ignore:
Timestamp:
Sep 23, 2013 3:37:56 AM (11 years ago)
Author:
bennylp
Message:

Re #1519: initial implementation (incomplete) to demonstrate the API style/pattern

Location:
pjproject/branches/projects/pjsua2
Files:
25 added
3 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/pjsua2/pjsip-apps/build/Makefile

    r4489 r4597  
    5757# 
    5858# 
    59 TARGETS := pjsua pjsystest samples 
     59#TARGETS := swig pjsua pjsystest samples 
     60TARGETS := swig 
    6061 
    6162.PHONY: $(TARGETS) 
    … …  
    6364all: $(TARGETS) 
    6465 
     66swig: 
     67        $(MAKE) -C ../src/swig 
     68         
    6569doc: 
    6670 

  • pjproject/branches/projects/pjsua2/pjsip/build/Makefile

    r4308 r4597  
    1919export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 
    2020export PJSUA_LIB_LIB=../lib/libpjsua-$(TARGET_NAME)$(LIBEXT) 
     21export PJSUA2_LIB_LIB=../lib/libpjsua2-$(TARGET_NAME)$(LIBEXT) 
    2122 
    2223 
    … …  
    8586 
    8687############################################################################### 
     88# Defines for building pjsua2 library 
     89# 
     90export PJSUA2_LIB_SRCDIR = ../src/pjsua2 
     91export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
     92                           endpoint.o types.o 
     93export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 
     94export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)  
     95 
     96 
     97############################################################################### 
     98# Defines for building pjsua2-test application 
     99# 
     100export PJSUA2_TEST_SRCDIR = ../src/pjsua2-test 
     101export PJSUA2_TEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
     102                           main.o 
     103export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 
     104export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)  
     105export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 
     106export PJSUA2_TEST_EXE := ../bin/pjsua2-test-$(TARGET_NAME)$(HOST_EXE) 
     107 
     108export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  
     109 
     110 
     111############################################################################### 
    87112# Defines for building test application 
    88113# 
    … …  
    105130# 
    106131# 
    107 TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test 
     132TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsua2-lib pjsip-test pjsua2-test 
    108133 
    109134.PHONY: $(TARGETS) 
    … …  
    125150distclean: realclean 
    126151 
    127 .PHONY: dep depend pjsip pjsip-ua pjsua-lib clean realclean distclean 
     152.PHONY: dep depend pjsip pjsip-ua pjsua-lib pjsua2-lib clean realclean distclean 
    128153 
    129154pjsip: 
    … …  
    139164        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB) 
    140165 
     166pjsua2-lib:  
     167        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(PJSUA2_LIB_LIB) 
     168 
    141169pjsip-test: pjsip 
    142170        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE) 
    143171 
     172pjsua2-test: 
     173        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $(PJSUA2_TEST_EXE) 
     174 
    144175.PHONY: ../lib/pjsip.ko 
    145176../lib/pjsip.ko: 
    … …  
    167198        $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ 
    168199        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 
     200        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $@ 
    169201        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 
     202        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $@ 
    170203 
    171204depend: 
    … …  
    174207        $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ 
    175208        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 
     209        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $@ 
    176210        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 
    177         echo '$(TEST_EXE): $(PJMEDIA_LIB) $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend 
     211        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $@ 
     212        echo '$(TEST_EXE): $(PJMEDIA_LIB)  $(PJSUA2_LIB_LIB) $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend 
     213        echo '$(PJSUA2_TEST_EXE): $(PJSUA2_LIB_LIB)' >> .pjsua2-test-$(TARGET_NAME).depend 
    178214 
    179215realclean: 
    … …  
    182218        $(subst @@,$(subst /,$(HOST_PSEP),.pjsip-simple-$(TARGET_NAME).depend),$(HOST_RMR)) 
    183219        $(subst @@,$(subst /,$(HOST_PSEP),.pjsua-lib-$(TARGET_NAME).depend),$(HOST_RMR)) 
     220        $(subst @@,$(subst /,$(HOST_PSEP),.pjsua2-lib-$(TARGET_NAME).depend),$(HOST_RMR)) 
     221        $(subst @@,$(subst /,$(HOST_PSEP),.pjsua2-test-$(TARGET_NAME).depend),$(HOST_RMR)) 
    184222        $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ 
    185223        $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@ 
    … …  
    187225        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 
    188226        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 
    189  
    190  
    191  
     227        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $@ 
     228        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $@ 
     229 
     230 
     231 

  • pjproject/branches/projects/pjsua2/pjsip/docs/doxygen.cfg

    r3669 r4597  
    357357# *.h++ *.idl *.odl 
    358358 
    359 FILE_PATTERNS          = *.h 
     359FILE_PATTERNS          = *.h *.hpp 
    360360 
    361361# The RECURSIVE tag can be used to turn specify whether or not subdirectories  
Note: See TracChangeset for help on using the changeset viewer.