Makefile: use more standard output filenames for msm

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2019-04-19 08:04:39 +09:00
parent 64ce036fb6
commit 6f38514280
2 changed files with 3 additions and 3 deletions

View File

@ -21,8 +21,8 @@ dvl :: "wintun.DVL.XML"
msm :: \
"$(DIST_DIR)" \
"$(DIST_DIR)\wintun_$(WINTUN_VERSION)_x86.msm" \
"$(DIST_DIR)\wintun_$(WINTUN_VERSION)_amd64.msm"
"$(DIST_DIR)\wintun-x86-$(WINTUN_VERSION).msm" \
"$(DIST_DIR)\wintun-amd64-$(WINTUN_VERSION).msm"
"sdv\SDV.DVL.xml" "amd64\Release\vc.nativecodeanalysis.all.xml" :
msbuild.exe "wintun.vcxproj" /t:sdv /p:Inputs="/check:*" /p:Configuration="Release" /p:Platform="x64" $(MSBUILD_FLAGS)

View File

@ -30,7 +30,7 @@ clean ::
"$(OUTPUT_DIR)\wintun.wixobj" : "wintun.wxs"
"$(WIX)bin\candle.exe" $(WIX_CANDLE_FLAGS) -arch "$(PLAT_WIX)" -out $@ $**
"$(DIST_DIR)\wintun_$(WINTUN_VERSION)_$(PLAT).msm" : \
"$(DIST_DIR)\wintun-$(PLAT)-$(WINTUN_VERSION).msm" : \
"$(DIST_DIR)" \
"$(OUTPUT_DIR)\wintun.cer" \
"$(OUTPUT_DIR)\wintun\wintun.cat" \