Changeset 4489 for pjproject/trunk/pjsip-apps/build

Timestamp:

Apr 23, 2013 7:53:25 AM (11 years ago)

Author:

riza

Message:

Re #1643: Modification to avoid namespace conflict with pjsua

Location:

pjproject/trunk/pjsip-apps/build

Files:

• Makefile (modified) (1 diff)
• pjsua.vcproj (modified) (2 diffs)

pjproject/trunk/pjsip-apps/build/Makefile

@@ -34 +34 @@
 export PJSUA_SRCDIR = ../src/pjsua
 export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-            main.o pjsua_app.o pjsua_cli.o pjsua_common.o \
-            pjsua_config.o pjsua_legacy.o
+            main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \
+            pjsua_app_config.o pjsua_app_legacy.o
 export PJSUA_CFLAGS += $(_CFLAGS)
 export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)

pjproject/trunk/pjsip-apps/build/pjsua.vcproj

@@ -3709 +3709 @@
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_cli.c"
+                                RelativePath="..\src\pjsua\pjsua_app_cli.c"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_common.c"
+                                RelativePath="..\src\pjsua\pjsua_app_common.c"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_config.c"
+                                RelativePath="..\src\pjsua\pjsua_app_config.c"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_legacy.c"
+                                RelativePath="..\src\pjsua\pjsua_app_legacy.c"
                                 >
                         </File>
@@ -3734 +3734 @@
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_common.h"
+                                RelativePath="..\src\pjsua\pjsua_app_common.h"
                                 >
                         </File>