obj_int_extract.bat: Pass obj_int_extract.exe path to obj_int_extract.bat.
- Update the vcxproj generator to pass the path to the batch file. - Update the batch file the take the path to obj_int_extract.exe as arg 2. Fixes this warning: warning MSB8012: TargetPath does not match Linker's OutputFile property value. Change-Id: I5825f1d1d79f370aeb295bbd2aeb08b22c0e73ab
This commit is contained in:
Родитель
6c714bdbcd
Коммит
1d3ca088f6
|
@ -7,8 +7,12 @@ REM in the file PATENTS. All contributing project authors may
|
||||||
REM be found in the AUTHORS file in the root of the source tree.
|
REM be found in the AUTHORS file in the root of the source tree.
|
||||||
echo on
|
echo on
|
||||||
|
|
||||||
|
REM Arguments:
|
||||||
|
REM %1 - Relative path to the directory containing the vp8 and vpx_scale
|
||||||
|
REM source directories.
|
||||||
|
REM %2 - Path to obj_int_extract.exe.
|
||||||
cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vp8/encoder/vp8_asm_enc_offsets.c"
|
cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vp8/encoder/vp8_asm_enc_offsets.c"
|
||||||
obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm"
|
%2\obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm"
|
||||||
|
|
||||||
cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vpx_scale/vpx_scale_asm_offsets.c"
|
cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vpx_scale/vpx_scale_asm_offsets.c"
|
||||||
obj_int_extract.exe rvds "vpx_scale_asm_offsets.obj" > "vpx_scale_asm_offsets.asm"
|
%2\obj_int_extract.exe rvds "vpx_scale_asm_offsets.obj" > "vpx_scale_asm_offsets.asm"
|
||||||
|
|
|
@ -438,9 +438,13 @@ generate_vcxproj() {
|
||||||
for config in Debug Release; do
|
for config in Debug Release; do
|
||||||
open_tag ItemDefinitionGroup \
|
open_tag ItemDefinitionGroup \
|
||||||
Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
|
Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
|
||||||
if [ "$name" = "vpx" ]; then
|
if [ "$name" == "vpx" ]; then
|
||||||
|
hostplat=$plat
|
||||||
|
if [ "$hostplat" == "ARM" ]; then
|
||||||
|
hostplat=Win32
|
||||||
|
fi
|
||||||
open_tag PreBuildEvent
|
open_tag PreBuildEvent
|
||||||
tag_content Command "call obj_int_extract.bat $src_path_bare"
|
tag_content Command "call obj_int_extract.bat $src_path_bare $hostplat\\\$(Configuration)"
|
||||||
close_tag PreBuildEvent
|
close_tag PreBuildEvent
|
||||||
fi
|
fi
|
||||||
open_tag ClCompile
|
open_tag ClCompile
|
||||||
|
@ -483,9 +487,7 @@ generate_vcxproj() {
|
||||||
case "$proj_kind" in
|
case "$proj_kind" in
|
||||||
exe)
|
exe)
|
||||||
open_tag Link
|
open_tag Link
|
||||||
if [ "$name" = "obj_int_extract" ]; then
|
if [ "$name" != "obj_int_extract" ]; then
|
||||||
tag_content OutputFile "${name}.exe"
|
|
||||||
else
|
|
||||||
tag_content AdditionalDependencies "$curlibs"
|
tag_content AdditionalDependencies "$curlibs"
|
||||||
tag_content AdditionalLibraryDirectories "$libdirs;%(AdditionalLibraryDirectories)"
|
tag_content AdditionalLibraryDirectories "$libdirs;%(AdditionalLibraryDirectories)"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -7,6 +7,9 @@ REM in the file PATENTS. All contributing project authors may
|
||||||
REM be found in the AUTHORS file in the root of the source tree.
|
REM be found in the AUTHORS file in the root of the source tree.
|
||||||
echo on
|
echo on
|
||||||
|
|
||||||
|
REM Arguments:
|
||||||
|
REM %1 - Relative path to the directory containing the vp8 source directory.
|
||||||
|
REM %2 - Path to obj_int_extract.exe.
|
||||||
cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/vp8_asm_enc_offsets.c"
|
cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/vp8_asm_enc_offsets.c"
|
||||||
obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm"
|
%2\obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm"
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче