Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 04:16:12 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Updated libraries for VS 2015 C99 and legacy printf conformance

Browse Source 
- Static libraries built with _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS
This commit is contained in:
walbourn_cp
2015-01-24 01:17:54 -08:00
parent e06c43fc9b
commit 5f95b87ddf
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Texassemble/texassemble.cpp
View File

@@ -258,7 +258,7 @@ void PrintList(size_t cch, SValue *pValue)
cch = 6;
}
wprintf( L"%s ", pValue->pName );
wprintf( L"%ls ", pValue->pName );
cch += cchName + 2;
pValue++;
}
@@ -378,7 +378,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case OPT_WIDTH:
if (swscanf_s(pValue, L"%Iu", &width) != 1)
{
wprintf( L"Invalid value specified with -w (%s)\n", pValue);
wprintf( L"Invalid value specified with -w (%ls)\n", pValue);
return 1;
}
break;
@@ -386,7 +386,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case OPT_HEIGHT:
if (swscanf_s(pValue, L"%Iu", &height) != 1)
{
wprintf( L"Invalid value specified with -h (%s)\n", pValue);
wprintf( L"Invalid value specified with -h (%ls)\n", pValue);
return 1;
}
break;
@@ -395,7 +395,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
format = (DXGI_FORMAT) LookupByName(pValue, g_pFormats);
if ( !format )
{
wprintf( L"Invalid value specified with -f (%s)\n", pValue);
wprintf( L"Invalid value specified with -f (%ls)\n", pValue);
return 1;
}
break;
@@ -404,7 +404,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
dwFilter = LookupByName(pValue, g_pFilters);
if ( !dwFilter )
{
wprintf( L"Invalid value specified with -if (%s)\n", pValue);
wprintf( L"Invalid value specified with -if (%ls)\n", pValue);
return 1;
}
break;
@@ -493,7 +493,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
_wmakepath_s( szOutputFile, nullptr, nullptr, fname, L".dds" );
}
wprintf( L"reading %s", pConv->szSrc );
wprintf( L"reading %ls", pConv->szSrc );
fflush(stdout);
TexMetadata info;
@@ -710,7 +710,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
// Write texture
wprintf( L"\nWriting %s ", szOutputFile);
wprintf( L"\nWriting %ls ", szOutputFile);
PrintInfo( result.GetMetadata() );
wprintf( L"\n" );
fflush(stdout);