Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
commit
6e44f69c0f
|
@ -1,8 +1,13 @@
|
|||
!macro customInit
|
||||
|
||||
# guid=7e51495b-3f4d-5235-aadd-5636863064f0
|
||||
ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DS Talk_is1" "UninstallString"
|
||||
${If} $0 != ""
|
||||
MessageBox MB_ICONINFORMATION|MB_TOPMOST "이전 버전의 DS Talk을 제거 하시겠습니까?" IDOK
|
||||
ExecWait $0 $1
|
||||
${EndIf}
|
||||
!macroend
|
||||
|
||||
!macro customInstall
|
||||
File "${BUILD_RESOURCES_DIR}\win\bin\npcap-0.99-r7.exe"
|
||||
ExecWait '"$INSTDIR\npcap-0.99-r7.exe" /npf_startup=yes /loopback_support=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes'
|
||||
# File "${BUILD_RESOURCES_DIR}\win\bin\npcap-0.99-r7.exe"
|
||||
# ExecWait '"$INSTDIR\npcap-0.99-r7.exe" /npf_startup=yes /loopback_support=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes'
|
||||
!macroend
|
||||
|
|
|
@ -64,6 +64,7 @@
|
|||
"oneClick": true,
|
||||
"allowToChangeInstallationDirectory": false,
|
||||
"perMachine": false,
|
||||
"differentialPackage": true
|
||||
"differentialPackage": true,
|
||||
"include": "./config/build/win/nsis/installer.nsh"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user