diff options
| author | Riza Sulistyo <riza@teluu.com> | 2013-04-23 07:53:25 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2013-04-23 07:53:25 +0000 |
| commit | 1698328b74967bff2b86c705747b40b526275377 (patch) | |
| tree | 5c362e276123f96767cbd03ba4b86cf0a5c3c6a5 /pjsip-apps/build | |
| parent | e12b016e143ffbc81d3224d282bcaec31b755c04 (diff) | |
Re #1643: Modification to avoid namespace conflict with pjsua
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4489 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/build')
| -rw-r--r-- | pjsip-apps/build/Makefile | 4 | ||||
| -rw-r--r-- | pjsip-apps/build/pjsua.vcproj | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index cb48d718..6e5f2874 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -33,8 +33,8 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ # 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) export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjsip-apps/build/pjsua.vcproj b/pjsip-apps/build/pjsua.vcproj index d79126a4..f50543d5 100644 --- a/pjsip-apps/build/pjsua.vcproj +++ b/pjsip-apps/build/pjsua.vcproj @@ -3708,19 +3708,19 @@ </FileConfiguration>
</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>
</Filter>
@@ -3733,7 +3733,7 @@ >
</File>
<File
- RelativePath="..\src\pjsua\pjsua_common.h"
+ RelativePath="..\src\pjsua\pjsua_app_common.h"
>
</File>
</Filter>
|