Ignore:
Timestamp:
Dec 28, 2016 3:40:07 AM (8 years ago)
Author:
nanang
Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:
pjproject/branches/projects/uwp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/uwp

  • pjproject/branches/projects/uwp/pjsip-apps/build/Samples-vc.mak

    r4537 r5513  
    3737GSM_LIB = ..\..\third_party\lib\libgsmcodec-$(TARGET)$(LIBEXT) 
    3838ILBC_LIB = ..\..\third_party\lib\libilbccodec-$(TARGET)$(LIBEXT) 
    39 PORTAUDIO_LIB = ..\..\third_party\lib\libportaudio-$(TARGET)$(LIBEXT) 
     39#PORTAUDIO_LIB = ..\..\third_party\lib\libportaudio-$(TARGET)$(LIBEXT) 
    4040RESAMPLE_LIB = ..\..\third_party\lib\libresample-$(TARGET)$(LIBEXT) 
    4141SPEEX_LIB = ..\..\third_party\lib\libspeex-$(TARGET)$(LIBEXT) 
    … …  
    4343G7221_LIB = ..\..\third_party\lib\libg7221codec-$(TARGET)$(LIBEXT) 
    4444BASECLASSES_LIB = ..\..\third_party\lib\libbaseclasses-$(TARGET)$(LIBEXT) 
     45YUV_LIB = ..\..\third_party\lib\libyuv-$(TARGET)$(LIBEXT) 
     46WEBRTC_LIB = ..\..\third_party\lib\libwebrtc-$(TARGET)$(LIBEXT) 
    4547 
    46 THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(PORTAUDIO_LIB) $(RESAMPLE_LIB) \ 
    47                                    $(SPEEX_LIB) $(SRTP_LIB) $(G7221_LIB) $(BASECLASSES_LIB) 
     48THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(RESAMPLE_LIB) \ 
     49                   $(SPEEX_LIB) $(SRTP_LIB) $(G7221_LIB) $(BASECLASSES_LIB) \ 
     50                   $(YUV_LIB) $(WEBRTC_LIB) 
    4851 
    4952LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \ 
Note: See TracChangeset for help on using the changeset viewer.