Changeset 5470


Ignore:
Timestamp:
Oct 26, 2016 7:16:01 AM (3 years ago)
Author:
riza
Message:

Re #1900:

  • Modify some project files for x64 build.
  • Add some files/folder to the global ignore list.
  • Disable PJ_OS_HAS_CHECK_STACK as default.
  • Use ip_helper_generic.c which provides implementation to pj_enum_ip_interface() and pj_enum_ip_route().
Location:
pjproject/branches/projects/uwp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp

    • Property svn:global-ignores set to
      bin
      obj
      lib
      Bin
      output
      Debug
      Generated[^A-Ba-b0-9]Files
      Service[^A-Ba-b0-9]References
      *.opendb
      *.db
      *.user
  • pjproject/branches/projects/uwp/pjlib/build/pjlib.vcxproj

    r5210 r5470  
    605605      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
    606606    </ClCompile> 
    607     <ClCompile Include="..\src\pj\ip_helper_generic.c"> 
     607    <ClCompile Include="..\src\pj\ip_helper_winphone8.c"> 
    608608      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
    609609      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
     
    628628      <ExcludedFromBuild Condition="'$(API_Family)'!='WinDesktop'">true</ExcludedFromBuild> 
    629629    </ClCompile> 
    630     <ClCompile Include="..\src\pj\ip_helper_winphone8.c"> 
     630    <ClCompile Include="..\src\pj\ip_helper_generic.c"> 
    631631      <ExcludedFromBuild Condition="'$(API_Family)'=='WinDesktop'">true</ExcludedFromBuild> 
    632632    </ClCompile> 
  • pjproject/branches/projects/uwp/pjlib/build/pjlib.vcxproj.filters

    r5210 r5470  
    186186      <Filter>Source Files\Other Targets</Filter> 
    187187    </ClCompile> 
    188     <ClCompile Include="..\src\pj\ip_helper_generic.c"> 
    189       <Filter>Source Files\Other Targets</Filter> 
    190     </ClCompile> 
    191188    <ClCompile Include="..\src\pj\log_writer_printk.c"> 
    192189      <Filter>Source Files\Other Targets</Filter> 
     
    226223    </ClCompile> 
    227224    <ClCompile Include="..\src\pj\ip_helper_winphone8.c"> 
     225      <Filter>Source Files</Filter> 
     226    </ClCompile> 
     227    <ClCompile Include="..\src\pj\ip_helper_generic.c"> 
     228      <Filter>Source Files</Filter> 
     229    </ClCompile> 
     230    <ClCompile Include="..\src\pj\ip_helper_generic.c"> 
    228231      <Filter>Source Files</Filter> 
    229232    </ClCompile> 
  • pjproject/branches/projects/uwp/pjlib/include/pj/compat/os_winuwp.h

    r5210 r5470  
    115115#define PJ_HAS_HIGH_RES_TIMER       1 
    116116#define PJ_HAS_MALLOC               1 
    117 #define PJ_OS_HAS_CHECK_STACK       1 
     117 
     118#ifndef PJ_OS_HAS_CHECK_STACK 
     119#   define PJ_OS_HAS_CHECK_STACK    0 
     120#endif 
    118121 
    119122#define PJ_ATOMIC_VALUE_TYPE        long 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj

    r5254 r5470  
    9292    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    9393  </ImportGroup> 
     94  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
     95    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     96    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     97  </ImportGroup> 
    9498  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
    9599    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     
    98102  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
    99103    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     104    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     105  </ImportGroup> 
     106  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
     107    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    100108    <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    101109  </ImportGroup> 
     
    236244      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> 
    237245      <PrecompiledHeader>NotUsing</PrecompiledHeader> 
     246      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 
    238247      <CompileAsWinRT>true</CompileAsWinRT> 
    239248      <DisableSpecificWarnings>28204</DisableSpecificWarnings> 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj

    r5254 r5470  
    9090    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    9191  </ImportGroup> 
     92  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
     93    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     94    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     95  </ImportGroup>   
    9296  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
    9397    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     
    98102    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    99103  </ImportGroup> 
     104  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
     105    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     106    <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     107  </ImportGroup>   
    100108  <ImportGroup Label="ExtensionSettings"> 
    101109  </ImportGroup> 
     
    217225      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> 
    218226      <DisableSpecificWarnings>28204</DisableSpecificWarnings> 
     227      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 
     228      <CompileAsWinRT>true</CompileAsWinRT> 
    219229      <AdditionalIncludeDirectories>..\..\..\..\..\..\..\pjsip\include;..\..\..\..\..\..\..\pjlib\include;..\..\..\..\..\..\..\pjlib-util\include;..\..\..\..\..\..\..\pjmedia\include;..\..\..\..\..\..\..\pjnath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    220230    </ClCompile> 
Note: See TracChangeset for help on using the changeset viewer.