Changeset 4629


Ignore:
Timestamp:
Oct 22, 2013 3:34:41 AM (11 years ago)
Author:
riza
Message:

Re #1704: fixed some build warnings and errors

Location:
pjproject/branches/projects/winphone
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/winphone/pjlib-util/build

    • Property svn:ignore

      •  

        old new  
        88*.sln 
        99*.plg 
         10*vcxproj*.user 
        1011os-auto.mak 

  • pjproject/branches/projects/winphone/pjlib-util/build/pjlib_util.vcxproj

    r4618 r4629  
    358358    <Lib> 
    359359      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     360      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    360361    </Lib> 
    361362  </ItemDefinitionGroup> 
    … …  
    371372    <Lib> 
    372373      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     374      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    373375    </Lib> 
    374376  </ItemDefinitionGroup> 
    … …  
    392394    <Lib> 
    393395      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     396      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    394397    </Lib> 
    395398  </ItemDefinitionGroup> 
    … …  
    406409    <Lib> 
    407410      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     411      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    408412    </Lib> 
    409413  </ItemDefinitionGroup> 
    … …  
    427431    <Lib> 
    428432      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     433      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    429434    </Lib> 
    430435  </ItemDefinitionGroup> 
    … …  
    441446    <Lib> 
    442447      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     448      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    443449    </Lib> 
    444450  </ItemDefinitionGroup> 
    … …  
    462468    <Lib> 
    463469      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     470      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    464471    </Lib> 
    465472  </ItemDefinitionGroup> 
    … …  
    475482    <Lib> 
    476483      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     484      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    477485    </Lib> 
    478486  </ItemDefinitionGroup> 
    … …  
    496504    <Lib> 
    497505      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     506      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    498507    </Lib> 
    499508  </ItemDefinitionGroup> 
    … …  
    510519    <Lib> 
    511520      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     521      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    512522    </Lib> 
    513523  </ItemDefinitionGroup> 
    … …  
    531541    <Lib> 
    532542      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     543      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    533544    </Lib> 
    534545  </ItemDefinitionGroup> 
    … …  
    544555    <Lib> 
    545556      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     557      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    546558    </Lib> 
    547559  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjlib-util/build/pjlib_util_test.vcxproj

    r4618 r4629  
    348348      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    349349      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     350      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    350351    </Link> 
    351352  </ItemDefinitionGroup> 
    … …  
    386387      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    387388      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     389      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    388390    </Link> 
    389391  </ItemDefinitionGroup> 
    … …  
    425427      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    426428      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     429      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    427430    </Link> 
    428431  </ItemDefinitionGroup> 
    … …  
    464467      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    465468      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     469      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    466470    </Link> 
    467471  </ItemDefinitionGroup> 
    … …  
    502506      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    503507      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     508      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    504509    </Link> 
    505510  </ItemDefinitionGroup> 
    … …  
    541546      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    542547      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     548      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    543549    </Link> 
    544550  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjlib/build/pjlib.vcxproj

    r4620 r4629  
    480480      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
    481481      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     482      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     483      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     484      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     485      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     486      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     487      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
    482488    </ClCompile> 
    483489    <ClCompile Include="..\src\pj\activesock.c" /> 
    … …  
    566572    <ClCompile Include="..\src\pj\ip_helper_winphone.c"> 
    567573      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     574      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     575      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     576      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     577      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     578      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     579      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
    568580    </ClCompile> 
    569581    <ClCompile Include="..\src\pj\list.c" /> 
    … …  
    921933  <ItemGroup> 
    922934    <ClInclude Include="..\..\third_party\threademulation\include\ThreadEmulation.h" /> 
    923     <ClInclude Include="..\include\pj\compat\os_winphone.h" />     
     935    <ClInclude Include="..\include\pj\compat\os_winphone.h" /> 
    924936    <ClInclude Include="..\src\pj\ioqueue_common_abs.h" /> 
    925937    <ClInclude Include="..\include\pj\activesock.h" /> 

  • pjproject/branches/projects/winphone/pjlib/build/pjlib_test.vcxproj

    r4620 r4629  
    348348      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    349349      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     350      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    350351    </Link> 
    351352  </ItemDefinitionGroup> 
    … …  
    387388      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    388389      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     390      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    389391    </Link> 
    390392  </ItemDefinitionGroup> 
    … …  
    425427      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    426428      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     429      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    427430    </Link> 
    428431  </ItemDefinitionGroup> 
    … …  
    464467      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    465468      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     469      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    466470    </Link> 
    467471  </ItemDefinitionGroup> 
    … …  
    502506      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    503507      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     508      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    504509    </Link> 
    505510  </ItemDefinitionGroup> 
    … …  
    541546      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    542547      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     548      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    543549    </Link> 
    544550  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjlib/src/pj/file_access_win32.c

    r4618 r4629  
    3434#endif 
    3535 
     36static pj_status_t get_file_size(HANDLE hFile, pj_off_t *size) 
     37{ 
     38#ifdef PJ_WIN32_WINPHONE   
     39    FILE_STANDARD_INFO fileInfo; 
     40 
     41    if (GetFileInformationByHandleEx(hFile, FileStandardInfo, &fileInfo, 
     42                                     sizeof(FILE_STANDARD_INFO)))  
     43    { 
     44        *size = fileInfo.AllocationSize.QuadPart;        
     45    } else {     
     46        *size = -1; 
     47        return PJ_RETURN_OS_ERROR(GetLastError()); 
     48    } 
     49#else 
     50    DWORD sizeLo, sizeHi; 
     51 
     52    sizeLo = GetFileSize(hFile, &sizeHi); 
     53    if (sizeLo == INVALID_FILE_SIZE) { 
     54        DWORD dwStatus = GetLastError(); 
     55        if (dwStatus != NO_ERROR) {             
     56            *size = -1; 
     57            return PJ_RETURN_OS_ERROR(dwStatus); 
     58        } 
     59    } 
     60    *size = sizeHi; 
     61    *size = ((*size) << 32) + sizeLo; 
     62#endif 
     63    return PJ_SUCCESS; 
     64} 
     65 
    3666static HANDLE WINAPI create_file(LPCTSTR filename, DWORD desired_access, 
    3767                                 DWORD share_mode,  
    … …  
    4171                                 HANDLE template_file) 
    4272{ 
    43 #ifdef PJ_WIN32_WINPHONE   
     73#ifdef PJ_WIN32_WINPHONE 
     74    PJ_UNUSED_ARG(security_attributes); 
     75    PJ_UNUSED_ARG(flags_and_attributes); 
     76    PJ_UNUSED_ARG(template_file); 
     77 
    4478    return CreateFile2(filename, desired_access, share_mode,  
    4579                       creation_disposition, NULL); 
    … …  
    81115{ 
    82116    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256) 
    83     HANDLE hFile; 
    84     DWORD sizeLo, sizeHi; 
     117    HANDLE hFile;     
    85118    pj_off_t size; 
    86119 
    … …  
    95128        return -1; 
    96129 
    97     sizeLo = GetFileSize(hFile, &sizeHi); 
    98     if (sizeLo == INVALID_FILE_SIZE) { 
    99         DWORD dwStatus = GetLastError(); 
    100         if (dwStatus != NO_ERROR) { 
    101             CloseHandle(hFile); 
    102             return -1; 
    103         } 
    104     } 
    105  
    106     size = sizeHi; 
    107     size = (size << 32) + sizeLo; 
     130    get_file_size(hFile, &size); 
    108131 
    109132    CloseHandle(hFile); 
    … …  
    158181                                         pj_time_val *time_val) 
    159182{ 
    160     FILETIME local_file_time; 
     183    //FILETIME local_file_time; 
    161184    SYSTEMTIME localTime; 
    162185    pj_parsed_time pt; 
    163186 
    164     if (!FileTimeToLocalFileTime(file_time, &local_file_time)) 
    165         return PJ_RETURN_OS_ERROR(GetLastError()); 
     187    //if (!FileTimeToLocalFileTime(file_time, &local_file_time)) 
     188    //  return PJ_RETURN_OS_ERROR(GetLastError()); 
    166189 
    167190    if (!FileTimeToSystemTime(file_time, &localTime)) 
    … …  
    192215    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256) 
    193216    HANDLE hFile; 
    194     DWORD sizeLo, sizeHi; 
    195217    FILETIME creationTime, accessTime, writeTime; 
     218#ifdef PJ_WIN32_WINPHONE 
     219    FILE_BASIC_INFO fileInfo; 
     220#endif 
    196221 
    197222    PJ_ASSERT_RETURN(filename!=NULL && stat!=NULL, PJ_EINVAL); 
    … …  
    204229    if (hFile == INVALID_HANDLE_VALUE) 
    205230        return PJ_RETURN_OS_ERROR(GetLastError()); 
    206  
    207     sizeLo = GetFileSize(hFile, &sizeHi); 
    208     if (sizeLo == INVALID_FILE_SIZE) { 
    209         DWORD dwStatus = GetLastError(); 
    210         if (dwStatus != NO_ERROR) { 
    211             CloseHandle(hFile); 
    212             return PJ_RETURN_OS_ERROR(dwStatus); 
    213         } 
    214     } 
    215  
    216     stat->size = sizeHi; 
    217     stat->size = (stat->size << 32) + sizeLo; 
    218  
     231     
     232    if (get_file_size(hFile, &stat->size) != PJ_SUCCESS) { 
     233        CloseHandle(hFile); 
     234        return PJ_RETURN_OS_ERROR(GetLastError()); 
     235    } 
     236#ifdef PJ_WIN32_WINPHONE 
     237    if (GetFileInformationByHandleEx(hFile, FileBasicInfo, &fileInfo, 
     238                                     sizeof(FILE_BASIC_INFO)))  
     239    { 
     240        creationTime.dwLowDateTime = fileInfo.CreationTime.LowPart; 
     241        creationTime.dwHighDateTime = fileInfo.CreationTime.HighPart; 
     242        accessTime.dwLowDateTime = fileInfo.LastAccessTime.LowPart; 
     243        accessTime.dwHighDateTime = fileInfo.LastAccessTime.HighPart; 
     244        writeTime.dwLowDateTime = fileInfo.LastWriteTime.LowPart; 
     245        writeTime.dwHighDateTime = fileInfo.LastWriteTime.HighPart; 
     246    } else {     
     247        CloseHandle(hFile); 
     248        return PJ_RETURN_OS_ERROR(GetLastError()); 
     249    } 
     250#else 
    219251    if (GetFileTime(hFile, &creationTime, &accessTime, &writeTime)==FALSE) { 
    220252        DWORD dwStatus = GetLastError(); 
    … …  
    222254        return PJ_RETURN_OS_ERROR(dwStatus); 
    223255    } 
     256#endif 
    224257 
    225258    CloseHandle(hFile); 

  • pjproject/branches/projects/winphone/pjlib/src/pj/file_io_win32.c

    r4618 r4629  
    185185*/ 
    186186 
     187static pj_status_t set_file_pointer(pj_oshandle_t fd, 
     188                                    pj_off_t offset, 
     189                                    pj_off_t* newPos, 
     190                                    DWORD dwMoveMethod) 
     191{ 
     192#ifdef PJ_WIN32_WINPHONE 
     193    LARGE_INTEGER liDistance, liNewPos;     
     194 
     195    liDistance.QuadPart = offset; 
     196    if (!SetFilePointerEx(fd, liDistance, &liNewPos, dwMoveMethod)) { 
     197        return PJ_RETURN_OS_ERROR(GetLastError()); 
     198    } 
     199    *newPos = liNewPos.QuadPart; 
     200#else 
     201    DWORD dwNewPos; 
     202    LONG  hi32; 
     203 
     204    hi32 = (LONG)(offset >> 32); 
     205 
     206    dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod); 
     207    if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) { 
     208        DWORD dwStatus = GetLastError(); 
     209        if (dwStatus != 0) 
     210            return PJ_RETURN_OS_ERROR(dwStatus); 
     211        /* dwNewPos actually is not an error. */ 
     212    } 
     213    *newPos = hi32; 
     214    *newPos = (*newPos << 32) + dwNewPos; 
     215#endif 
     216 
     217    return PJ_SUCCESS; 
     218} 
     219 
    187220PJ_DEF(pj_status_t) pj_file_setpos( pj_oshandle_t fd, 
    188221                                    pj_off_t offset, 
    … …  
    190223{ 
    191224    DWORD dwMoveMethod; 
    192     DWORD dwNewPos; 
    193     LONG  hi32; 
     225    pj_off_t newPos; 
    194226 
    195227    if (whence == PJ_SEEK_SET) 
    … …  
    202234        pj_assert(!"Invalid whence in file_setpos"); 
    203235        return PJ_EINVAL; 
    204     } 
    205  
    206     hi32 = (LONG)(offset >> 32); 
    207     dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod); 
    208     if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) { 
    209         DWORD dwStatus = GetLastError(); 
    210         if (dwStatus != 0) 
    211             return PJ_RETURN_OS_ERROR(dwStatus); 
    212         /* dwNewPos actually is not an error. */ 
     236    }     
     237     
     238    if (set_file_pointer(fd, offset, &newPos, dwMoveMethod) != PJ_SUCCESS) { 
     239        return PJ_RETURN_OS_ERROR(GetLastError()); 
    213240    } 
    214241 
    … …  
    219246                                    pj_off_t *pos) 
    220247{ 
    221     LONG hi32 = 0; 
    222     DWORD lo32; 
    223  
    224     lo32 = SetFilePointer(fd, 0, &hi32, FILE_CURRENT); 
    225     if (lo32 == (DWORD)INVALID_SET_FILE_POINTER) { 
    226         DWORD dwStatus = GetLastError(); 
    227         if (dwStatus != 0) 
    228             return PJ_RETURN_OS_ERROR(dwStatus); 
    229     } 
    230  
    231     *pos = hi32; 
    232     *pos = (*pos << 32) + lo32; 
     248    if (set_file_pointer(fd, 0, pos, FILE_CURRENT) != PJ_SUCCESS) { 
     249        return PJ_RETURN_OS_ERROR(GetLastError()); 
     250    } 
     251 
    233252    return PJ_SUCCESS; 
    234253} 

  • pjproject/branches/projects/winphone/pjlib/src/pj/os_info.c

    r4618 r4629  
    187187#elif defined(_MSC_VER) 
    188188    { 
    189         OSVERSIONINFO ovi; 
    190  
    191         ovi.dwOSVersionInfoSize = sizeof(ovi); 
    192  
    193 #ifdef PJ_WIN32_WINPHONE 
    194         goto get_sdk_info; 
    195 #else 
    196         if (GetVersionEx(&ovi) == FALSE) 
    197             goto get_sdk_info; 
    198 #endif 
    199  
    200         si.os_ver = (ovi.dwMajorVersion << 24) | 
    201                     (ovi.dwMinorVersion << 16); 
    202         #if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE 
    203             si.os_name = pj_str("wince"); 
     189        #ifdef PJ_WIN32_WINPHONE 
     190            si.os_name = pj_str("winphone"); 
    204191        #else 
    205             si.os_name = pj_str("win32"); 
     192            OSVERSIONINFO ovi; 
     193 
     194            ovi.dwOSVersionInfoSize = sizeof(ovi); 
     195            if (GetVersionEx(&ovi) == FALSE) 
     196                goto get_sdk_info; 
     197 
     198            si.os_ver = (ovi.dwMajorVersion << 24) |  
     199                        (ovi.dwMinorVersion << 16); 
     200 
     201            #if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE 
     202                si.os_name = pj_str("wince"); 
     203            #else 
     204                si.os_name = pj_str("win32"); 
     205            #endif 
    206206        #endif 
    207207    } 
    … …  
    210210        SYSTEM_INFO wsi; 
    211211 
     212    #ifdef PJ_WIN32_WINPHONE 
     213        GetNativeSystemInfo(&wsi); 
     214    #else 
    212215        GetSystemInfo(&wsi); 
     216    #endif 
     217 
    213218        switch (wsi.wProcessorArchitecture) { 
    214     #if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE 
     219    #if (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE) || \ 
     220        (defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE) 
     221 
    215222        case PROCESSOR_ARCHITECTURE_ARM: 
    216223            si.machine = pj_str("arm"); 
    … …  
    229236            si.machine = pj_str("i386"); 
    230237            break; 
    231     #endif      /* PJ_WIN32_WINCE */ 
     238    #endif      /* PJ_WIN32_WINCE || PJ_WIN32_WINPHONE */ 
    232239        } 
     240    #ifdef PJ_WIN32_WINPHONE 
     241        /* Avoid compile warning. */ 
     242        goto get_sdk_info; 
     243    #endif 
    233244    } 
    234245#elif defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 

  • pjproject/branches/projects/winphone/pjmedia/build/pjmedia.vcxproj

    r4618 r4629  
    299299      </PrecompiledHeaderOutputFile> 
    300300    </ClCompile> 
     301    <Lib> 
     302      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     303    </Lib> 
    301304  </ItemDefinitionGroup> 
    302305  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
    … …  
    309312      <PrecompiledHeaderOutputFile /> 
    310313    </ClCompile> 
     314    <Lib> 
     315      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     316    </Lib> 
    311317  </ItemDefinitionGroup> 
    312318  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    … …  
    316322      <PrecompiledHeaderOutputFile /> 
    317323    </ClCompile> 
     324    <Lib> 
     325      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     326    </Lib> 
    318327  </ItemDefinitionGroup> 
    319328  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
    … …  
    324333      </PrecompiledHeaderOutputFile> 
    325334    </ClCompile> 
     335    <Lib> 
     336      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     337    </Lib> 
    326338  </ItemDefinitionGroup> 
    327339  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    … …  
    335347      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    336348    </ClCompile> 
     349    <Lib> 
     350      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     351    </Lib> 
    337352  </ItemDefinitionGroup> 
    338353  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> 
    … …  
    350365      </PrecompiledHeaderOutputFile> 
    351366    </ClCompile> 
     367    <Lib> 
     368      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     369    </Lib> 
    352370  </ItemDefinitionGroup> 
    353371  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    … …  
    361379      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    362380    </ClCompile> 
     381    <Lib> 
     382      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     383    </Lib> 
    363384  </ItemDefinitionGroup> 
    364385  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'"> 
    … …  
    376397      </PrecompiledHeaderOutputFile> 
    377398    </ClCompile> 
     399    <Lib> 
     400      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     401    </Lib> 
    378402  </ItemDefinitionGroup> 
    379403  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    … …  
    386410      <PrecompiledHeaderOutputFile /> 
    387411    </ClCompile> 
     412    <Lib> 
     413      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     414    </Lib> 
    388415  </ItemDefinitionGroup> 
    389416  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'"> 
    … …  
    401428      </PrecompiledHeaderOutputFile> 
    402429    </ClCompile> 
     430    <Lib> 
     431      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     432    </Lib> 
    403433  </ItemDefinitionGroup> 
    404434  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    … …  
    412442      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    413443    </ClCompile> 
     444    <Lib> 
     445      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     446    </Lib> 
    414447  </ItemDefinitionGroup> 
    415448  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> 
    … …  
    427460      </PrecompiledHeaderOutputFile> 
    428461    </ClCompile> 
     462    <Lib> 
     463      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     464    </Lib> 
    429465  </ItemDefinitionGroup> 
    430466  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> 
    … …  
    437473      <PrecompiledHeaderOutputFile /> 
    438474    </ClCompile> 
     475    <Lib> 
     476      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
     477    </Lib> 
    439478  </ItemDefinitionGroup> 
    440479  <ItemGroup> 

  • pjproject/branches/projects/winphone/pjmedia/build/pjmedia_codec.vcxproj

    r4618 r4629  
    358358    <Lib> 
    359359      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     360      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    360361    </Lib> 
    361362  </ItemDefinitionGroup> 
    … …  
    372373    <Lib> 
    373374      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     375      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    374376    </Lib> 
    375377  </ItemDefinitionGroup> 
    … …  
    393395    <Lib> 
    394396      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     397      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    395398    </Lib> 
    396399  </ItemDefinitionGroup> 
    … …  
    406409    <Lib> 
    407410      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     411      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    408412    </Lib> 
    409413  </ItemDefinitionGroup> 
    … …  
    427431    <Lib> 
    428432      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     433      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    429434    </Lib> 
    430435  </ItemDefinitionGroup> 
    … …  
    441446    <Lib> 
    442447      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     448      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    443449    </Lib> 
    444450  </ItemDefinitionGroup> 
    … …  
    462468    <Lib> 
    463469      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     470      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    464471    </Lib> 
    465472  </ItemDefinitionGroup> 
    … …  
    475482    <Lib> 
    476483      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     484      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    477485    </Lib> 
    478486  </ItemDefinitionGroup> 
    … …  
    496504    <Lib> 
    497505      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     506      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    498507    </Lib> 
    499508  </ItemDefinitionGroup> 
    … …  
    510519    <Lib> 
    511520      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     521      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    512522    </Lib> 
    513523  </ItemDefinitionGroup> 
    … …  
    531541    <Lib> 
    532542      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     543      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    533544    </Lib> 
    534545  </ItemDefinitionGroup> 
    … …  
    544555    <Lib> 
    545556      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     557      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    546558    </Lib> 
    547559  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjmedia/build/pjmedia_test.vcxproj

    r4618 r4629  
    349349      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    350350      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     351      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    351352    </Link> 
    352353  </ItemDefinitionGroup> 
    … …  
    390391      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    391392      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     393      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    392394    </Link> 
    393395  </ItemDefinitionGroup> 
    … …  
    429431      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    430432      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     433      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    431434    </Link> 
    432435  </ItemDefinitionGroup> 
    … …  
    470473      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    471474      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     475      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    472476    </Link> 
    473477  </ItemDefinitionGroup> 
    … …  
    509513      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    510514      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     515      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    511516    </Link> 
    512517  </ItemDefinitionGroup> 
    … …  
    551556      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    552557      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     558      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    553559    </Link> 
    554560  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjmedia/build/pjmedia_videodev.vcxproj

    r4618 r4629  
    358358    <Lib> 
    359359      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     360      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    360361    </Lib> 
    361362  </ItemDefinitionGroup> 
    … …  
    372373    <Lib> 
    373374      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     375      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    374376    </Lib> 
    375377  </ItemDefinitionGroup> 
    … …  
    393395    <Lib> 
    394396      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     397      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    395398    </Lib> 
    396399  </ItemDefinitionGroup> 
    … …  
    406409    <Lib> 
    407410      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     411      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    408412    </Lib> 
    409413  </ItemDefinitionGroup> 
    … …  
    427431    <Lib> 
    428432      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     433      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    429434    </Lib> 
    430435  </ItemDefinitionGroup> 
    … …  
    441446    <Lib> 
    442447      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     448      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    443449    </Lib> 
    444450  </ItemDefinitionGroup> 
    … …  
    462468    <Lib> 
    463469      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     470      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    464471    </Lib> 
    465472  </ItemDefinitionGroup> 
    … …  
    475482    <Lib> 
    476483      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     484      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    477485    </Lib> 
    478486  </ItemDefinitionGroup> 
    … …  
    496504    <Lib> 
    497505      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     506      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    498507    </Lib> 
    499508  </ItemDefinitionGroup> 
    … …  
    510519    <Lib> 
    511520      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     521      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    512522    </Lib> 
    513523  </ItemDefinitionGroup> 
    … …  
    531541    <Lib> 
    532542      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     543      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    533544    </Lib> 
    534545  </ItemDefinitionGroup> 
    … …  
    544555    <Lib> 
    545556      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     557      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    546558    </Lib> 
    547559  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjnath/build/pjnath_test.vcxproj

    r4618 r4629  
    348348      <AdditionalDependencies>netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    349349      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     350      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    350351    </Link> 
    351352  </ItemDefinitionGroup> 
    … …  
    387388      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    388389      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     390      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    389391    </Link> 
    390392  </ItemDefinitionGroup> 
    … …  
    425427      <AdditionalDependencies>netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    426428      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     429      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    427430    </Link> 
    428431  </ItemDefinitionGroup> 
    … …  
    464467      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    465468      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     469      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    466470    </Link> 
    467471  </ItemDefinitionGroup> 
    … …  
    502506      <AdditionalDependencies>netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    503507      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     508      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    504509    </Link> 
    505510  </ItemDefinitionGroup> 
    … …  
    541546      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    542547      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     548      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    543549    </Link> 
    544550  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjproject-vs11.sln

    r4620 r4629  
    26072607                {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 
    26082608                {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Win32.ActiveCfg = Debug|Win32 
     2609                {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Win32.Build.0 = Debug|Win32 
    26092610                {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 
    26102611                {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 

  • pjproject/branches/projects/winphone/pjsip-apps/build/libpjproject.vcxproj

    r4618 r4629  
    349349    <Lib> 
    350350      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     351      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    351352    </Lib> 
    352353  </ItemDefinitionGroup> 
    … …  
    362363    <Lib> 
    363364      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     365      <AdditionalOptions>/ignore:4221 /ignore:4264 </AdditionalOptions> 
    364366    </Lib> 
    365367  </ItemDefinitionGroup> 
    … …  
    378380    <Lib> 
    379381      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     382      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    380383    </Lib> 
    381384  </ItemDefinitionGroup> 
    … …  
    390393    <Lib> 
    391394      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     395      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    392396    </Lib> 
    393397  </ItemDefinitionGroup> 
    … …  
    403407    <Lib> 
    404408      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     409      <AdditionalOptions>/ignore:4221 /ignore:4264 </AdditionalOptions> 
    405410    </Lib> 
    406411  </ItemDefinitionGroup> 
    … …  
    418423    <Lib> 
    419424      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     425      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    420426    </Lib> 
    421427  </ItemDefinitionGroup> 
    … …  
    430436    <Lib> 
    431437      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     438      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    432439    </Lib> 
    433440  </ItemDefinitionGroup> 
    … …  
    443450    <Lib> 
    444451      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     452      <AdditionalOptions>/ignore:4221 /ignore:4264 </AdditionalOptions> 
    445453    </Lib> 
    446454  </ItemDefinitionGroup> 
    … …  
    459467    <Lib> 
    460468      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     469      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    461470    </Lib> 
    462471  </ItemDefinitionGroup> 
    … …  
    471480    <Lib> 
    472481      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     482      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    473483    </Lib> 
    474484  </ItemDefinitionGroup> 
    … …  
    484494    <Lib> 
    485495      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     496      <AdditionalOptions>/ignore:4221 /ignore:4264 </AdditionalOptions> 
    486497    </Lib> 
    487498  </ItemDefinitionGroup> 
    … …  
    499510    <Lib> 
    500511      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     512      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    501513    </Lib> 
    502514  </ItemDefinitionGroup> 
    … …  
    511523    <Lib> 
    512524      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     525      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    513526    </Lib> 
    514527  </ItemDefinitionGroup> 
    … …  
    524537    <Lib> 
    525538      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     539      <AdditionalOptions>/ignore:4221 /ignore:4264 </AdditionalOptions> 
    526540    </Lib> 
    527541  </ItemDefinitionGroup> 
    … …  
    540554    <Lib> 
    541555      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     556      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    542557    </Lib> 
    543558  </ItemDefinitionGroup> 
    … …  
    552567    <Lib> 
    553568      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     569      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    554570    </Lib> 
    555571  </ItemDefinitionGroup> 
    … …  
    565581    <Lib> 
    566582      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     583      <AdditionalOptions>/ignore:4221 /ignore:4264 </AdditionalOptions> 
    567584    </Lib> 
    568585  </ItemDefinitionGroup> 
    … …  
    580597    <Lib> 
    581598      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     599      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    582600    </Lib> 
    583601  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjsip-apps/build/pjsua.vcxproj

    r4618 r4629  
    313313    <Link> 
    314314      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     315      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    315316    </Link> 
    316317  </ItemDefinitionGroup> 
    … …  
    356357      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    357358      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     359      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    358360    </Link> 
    359361  </ItemDefinitionGroup> 
    … …  
    407409    <Link> 
    408410      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     411      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    409412    </Link> 
    410413  </ItemDefinitionGroup> 
    … …  
    450453    <Link> 
    451454      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     455      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    452456    </Link> 
    453457  </ItemDefinitionGroup> 
    … …  
    492496    <Link> 
    493497      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     498      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    494499    </Link> 
    495500  </ItemDefinitionGroup> 
    … …  
    535540    <Link> 
    536541      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     542      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    537543    </Link> 
    538544  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjsip-apps/build/pjsystest.vcxproj

    r4618 r4629  
    101101    <Link> 
    102102      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     103      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    103104    </Link> 
    104105  </ItemDefinitionGroup> 
    … …  
    133134    <Link> 
    134135      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     136      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    135137    </Link> 
    136138  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjsip-apps/build/sample_debug.vcxproj

    r4618 r4629  
    349349      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    350350      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     351      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    351352    </Link> 
    352353  </ItemDefinitionGroup> 
    … …  
    390391      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    391392      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     393      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    392394    </Link> 
    393395  </ItemDefinitionGroup> 
    … …  
    429431      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    430432      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     433      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    431434    </Link> 
    432435  </ItemDefinitionGroup> 
    … …  
    470473      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    471474      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     475      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    472476    </Link> 
    473477  </ItemDefinitionGroup> 
    … …  
    509513      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    510514      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     515      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    511516    </Link> 
    512517  </ItemDefinitionGroup> 
    … …  
    551556      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
    552557      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> 
     558      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    553559    </Link> 
    554560  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjsip-apps/build/samples.vcxproj

    r4618 r4629  
    253253    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir> 
    254254    <IntDir>$(OutDir)</IntDir> 
    255     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8</NMakeBuildCommandLine> 
    256     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a</NMakeReBuildCommandLine> 
    257     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean</NMakeCleanCommandLine> 
     255    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=11</NMakeBuildCommandLine> 
     256    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=11 /a</NMakeReBuildCommandLine> 
     257    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=11 clean</NMakeCleanCommandLine> 
    258258    <NMakeOutput>All samples</NMakeOutput> 
    259259  </PropertyGroup> 
    … …  
    268268    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir> 
    269269    <IntDir>$(OutDir)</IntDir> 
    270     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 ARCH=win64</NMakeBuildCommandLine> 
    271     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 ARCH=win64 /a</NMakeReBuildCommandLine> 
    272     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 ARCH=win64 clean</NMakeCleanCommandLine> 
     270    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=11 ARCH=win64</NMakeBuildCommandLine> 
     271    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=11 ARCH=win64 /a</NMakeReBuildCommandLine> 
     272    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=11 ARCH=win64 clean</NMakeCleanCommandLine> 
    273273    <NMakeOutput>All samples</NMakeOutput> 
    274274  </PropertyGroup> 
    … …  
    276276    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir> 
    277277    <IntDir>$(OutDir)</IntDir> 
    278     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 ARCH=win32</NMakeBuildCommandLine> 
    279     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 ARCH=win32 /a</NMakeReBuildCommandLine> 
    280     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 ARCH=win32 clean</NMakeCleanCommandLine> 
     278    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=11 ARCH=win32</NMakeBuildCommandLine> 
     279    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=11 ARCH=win32 /a</NMakeReBuildCommandLine> 
     280    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=11 ARCH=win32 clean</NMakeCleanCommandLine> 
    281281    <NMakeOutput>All samples</NMakeOutput> 
    282282  </PropertyGroup> 
    … …  
    291291    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir> 
    292292    <IntDir>$(OutDir)</IntDir> 
    293     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 ARCH=win64</NMakeBuildCommandLine> 
    294     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 ARCH=win64 /a </NMakeReBuildCommandLine> 
    295     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 ARCH=win64 clean</NMakeCleanCommandLine> 
     293    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=11 ARCH=win64</NMakeBuildCommandLine> 
     294    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=11 ARCH=win64 /a </NMakeReBuildCommandLine> 
     295    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=11 ARCH=win64 clean</NMakeCleanCommandLine> 
    296296    <NMakeOutput>All samples</NMakeOutput> 
    297297  </PropertyGroup> 
    … …  
    299299    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir> 
    300300    <IntDir>$(OutDir)</IntDir> 
    301     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 ARCH=win32s</NMakeBuildCommandLine> 
    302     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 ARCH=win32 /a</NMakeReBuildCommandLine> 
    303     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 ARCH=win32 clean</NMakeCleanCommandLine> 
     301    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=11 ARCH=win32s</NMakeBuildCommandLine> 
     302    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=11 ARCH=win32 /a</NMakeReBuildCommandLine> 
     303    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=11 ARCH=win32 clean</NMakeCleanCommandLine> 
    304304    <NMakeOutput>All samples</NMakeOutput> 
    305305  </PropertyGroup> 
    … …  
    314314    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir> 
    315315    <IntDir>$(OutDir)</IntDir> 
    316     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 ARCH=win64</NMakeBuildCommandLine> 
    317     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 ARCH=win64 /a</NMakeReBuildCommandLine> 
    318     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 ARCH=win64 clean</NMakeCleanCommandLine> 
     316    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=11 ARCH=win64</NMakeBuildCommandLine> 
     317    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=11 ARCH=win64 /a</NMakeReBuildCommandLine> 
     318    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=11 ARCH=win64 clean</NMakeCleanCommandLine> 
    319319    <NMakeOutput>All samples</NMakeOutput> 
    320320  </PropertyGroup> 
    … …  
    322322    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir> 
    323323    <IntDir>$(OutDir)</IntDir> 
    324     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 ARCH=win32</NMakeBuildCommandLine> 
    325     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 ARCH=win32 /a</NMakeReBuildCommandLine> 
    326     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 ARCH=win32 clean</NMakeCleanCommandLine> 
     324    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=11 ARCH=win32</NMakeBuildCommandLine> 
     325    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=11 ARCH=win32 /a</NMakeReBuildCommandLine> 
     326    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=11 ARCH=win32 clean</NMakeCleanCommandLine> 
    327327    <NMakeOutput>All samples</NMakeOutput> 
    328328  </PropertyGroup> 
    … …  
    337337    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir> 
    338338    <IntDir>$(OutDir)</IntDir> 
    339     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 ARCH=win64</NMakeBuildCommandLine> 
    340     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 ARCH=win64 /a</NMakeReBuildCommandLine> 
    341     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 ARCH=win64 clean</NMakeCleanCommandLine> 
     339    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=11 ARCH=win64</NMakeBuildCommandLine> 
     340    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=11 ARCH=win64 /a</NMakeReBuildCommandLine> 
     341    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=11 ARCH=win64 clean</NMakeCleanCommandLine> 
    342342    <NMakeOutput>All samples</NMakeOutput> 
    343343  </PropertyGroup> 
    … …  
    345345    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir> 
    346346    <IntDir>$(OutDir)</IntDir> 
    347     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 ARCH=win32</NMakeBuildCommandLine> 
    348     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 ARCH=win32 /a</NMakeReBuildCommandLine> 
    349     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 ARCH=win32 clean</NMakeCleanCommandLine> 
     347    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=11 ARCH=win32</NMakeBuildCommandLine> 
     348    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=11 ARCH=win32 /a</NMakeReBuildCommandLine> 
     349    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=11 ARCH=win32 clean</NMakeCleanCommandLine> 
    350350    <NMakeOutput>All samples</NMakeOutput> 
    351351  </PropertyGroup> 
    … …  
    360360    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir> 
    361361    <IntDir>$(OutDir)</IntDir> 
    362     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 ARCH=win64</NMakeBuildCommandLine> 
    363     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 ARCH=win64 /a</NMakeReBuildCommandLine> 
    364     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 ARCH=win64 clean</NMakeCleanCommandLine> 
     362    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=11 ARCH=win64</NMakeBuildCommandLine> 
     363    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=11 ARCH=win64 /a</NMakeReBuildCommandLine> 
     364    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=11 ARCH=win64 clean</NMakeCleanCommandLine> 
    365365    <NMakeOutput>All samples</NMakeOutput> 
    366366  </PropertyGroup> 
    … …  
    368368    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir> 
    369369    <IntDir>$(OutDir)</IntDir> 
    370     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 ARCH=win32</NMakeBuildCommandLine> 
    371     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 ARCH=win32 /a</NMakeReBuildCommandLine> 
    372     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 ARCH=win32 clean</NMakeCleanCommandLine> 
     370    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=11 ARCH=win32</NMakeBuildCommandLine> 
     371    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=11 ARCH=win32 /a</NMakeReBuildCommandLine> 
     372    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=11 ARCH=win32 clean</NMakeCleanCommandLine> 
    373373    <NMakeOutput>All samples</NMakeOutput> 
    374374  </PropertyGroup> 
    … …  
    383383    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir> 
    384384    <IntDir>$(OutDir)</IntDir> 
    385     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 ARCH=win64</NMakeBuildCommandLine> 
    386     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 ARCH=win64 /a</NMakeReBuildCommandLine> 
    387     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 ARCH=win64 clean</NMakeCleanCommandLine> 
     385    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=11 ARCH=win64</NMakeBuildCommandLine> 
     386    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=11 ARCH=win64 /a</NMakeReBuildCommandLine> 
     387    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=11 ARCH=win64 clean</NMakeCleanCommandLine> 
    388388    <NMakeOutput>All samples</NMakeOutput> 
    389389  </PropertyGroup> 

  • pjproject/branches/projects/winphone/pjsip-apps/src/pjsystest/pjsystest_wince.rc

    r2835 r4629  
    88// Generated from the TEXTINCLUDE 2 resource. 
    99// 
    10 #include "afxres.h" 
     10#include "winresrc.h" 
    1111 
    1212///////////////////////////////////////////////////////////////////////////// 

  • pjproject/branches/projects/winphone/pjsip/build/pjsip_test.vcxproj

    r4618 r4629  
    348348      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    349349      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     350      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    350351    </Link> 
    351352  </ItemDefinitionGroup> 
    … …  
    386387      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    387388      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     389      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    388390    </Link> 
    389391  </ItemDefinitionGroup> 
    … …  
    425427      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    426428      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     429      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    427430    </Link> 
    428431  </ItemDefinitionGroup> 
    … …  
    464467      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    465468      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     469      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    466470    </Link> 
    467471  </ItemDefinitionGroup> 
    … …  
    502506      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    503507      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     508      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    504509    </Link> 
    505510  </ItemDefinitionGroup> 
    … …  
    541546      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    542547      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     548      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 
    543549    </Link> 
    544550  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/pjsip/build/pjsua_lib.vcxproj

    r4618 r4629  
    358358    <Lib> 
    359359      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     360      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    360361    </Lib> 
    361362  </ItemDefinitionGroup> 
    … …  
    393394    <Lib> 
    394395      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     396      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    395397    </Lib> 
    396398  </ItemDefinitionGroup> 
    … …  
    427429    <Lib> 
    428430      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     431      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    429432    </Lib> 
    430433  </ItemDefinitionGroup> 
    … …  
    462465    <Lib> 
    463466      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     467      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    464468    </Lib> 
    465469  </ItemDefinitionGroup> 
    … …  
    496500    <Lib> 
    497501      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     502      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    498503    </Lib> 
    499504  </ItemDefinitionGroup> 
    … …  
    531536    <Lib> 
    532537      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     538      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    533539    </Lib> 
    534540  </ItemDefinitionGroup> 

  • pjproject/branches/projects/winphone/third_party/build/portaudio/libportaudio.vcxproj

    r4618 r4629  
    372372    <Lib> 
    373373      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     374      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> 
    374375    </Lib> 
    375376  </ItemDefinitionGroup> 
Note: See TracChangeset for help on using the changeset viewer.