Changeset 198 for pjproject/trunk/pjsip/build

Timestamp:

Feb 19, 2006 2:24:27 AM (19 years ago)

Author:

bennylp

Message:

Fixing Makefiles for the new pjmedia-codec and pjsip-simple libraries

Location:

pjproject/trunk/pjsip/build

Files:

• Makefile (modified) (7 diffs)
• pjsip_simple.dsp (modified) (1 diff)

pjproject/trunk/pjsip/build/Makefile

@@ -6 +6 @@
 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
+PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 
 export PJSIP_LIB:=../lib/libpjsip-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
+export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 
 
@@ -20 +22 @@
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
+                   $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \
+                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
                    $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
-                   $(LDFLAGS) -lm
+                   $(LDFLAGS) -lm -lwinmm
 
 
@@ -51 +55 @@
 
 ###############################################################################
+# Defines for building PJSIP SIMPLE library
+#
+export PJSIP_SIMPLE_SRCDIR = ../src/pjsip-simple
+export PJSIP_SIMPLE_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+                        errno.o evsub.o evsub_msg.o pidf.o presence.o xpidf.o
+export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS)
+
+
+###############################################################################
 # Defines for building PJSUA
 #
 export PJSUA_SRCDIR = ../src/pjsua
 export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        main.o pjsua_reg.o pjsua_inv.o pjsua_core.o
+                        main.o pjsua_reg.o pjsua_inv.o pjsua_pres.o pjsua_opt.o \
+                        pjsua_core.o
 export PJSUA_CFLAGS += $(_CFLAGS)
 export PJSUA_LDFLAGS += $(_LDFLAGS)
@@ -67 +81 @@
 #
 #
-TARGETS := pjsip pjsip-ua pjsua
+TARGETS := pjsip pjsip-ua pjsip-simple pjsua
 
 all: $(TARGETS)
@@ -85 +99 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB)
 
-pjsua: $(PJSIP_LIB) $(PJSIP_UA_LIB)
+pjsip-simple:
+        $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB)
+
+pjsua: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB)
         $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
 
@@ -98 +115 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@
 
+.PHONY: ../lib/pjsip-simple.ko
+../lib/pjsip-simple.ko:
+        echo Making $@
+        $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@
+
 .PHONY: ../lib/pjsua.ko
 ../lib/pjsua.ko:
@@ -105 +127 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@
+        $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
         @if test "$@" == "depend"; then \

pjproject/trunk/pjsip/build/pjsip_simple.dsp

@@ -86 +86 @@
 # Begin Source File
 
+SOURCE="..\src\pjsip-simple\errno.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\pjsip-simple\evsub.c"
 # End Source File