Skip to content

Commit

Permalink
Use msvc2017 for release
Browse files Browse the repository at this point in the history
Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>
  • Loading branch information
g-maxime committed Oct 25, 2017
1 parent 791b6dd commit 9ac7d78
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Release/Release_CLI_Windows_i386.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rmdir MediaInfo_CLI_Windows_i386 /S /Q
mkdir MediaInfo_CLI_Windows_i386

rem --- Copying : Exe ---
xcopy ..\Project\MSVC2015\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S
xcopy ..\Project\MSVC2017\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S

rem --- Copying : Plugins ---
xcopy ..\Source\Resource\Plugin\Custom\* MediaInfo_CLI_Windows_i386\Plugin\Custom\ /S
Expand Down
2 changes: 1 addition & 1 deletion Release/Release_CLI_Windows_x64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rmdir MediaInfo_CLI_Windows_x64 /S /Q
mkdir MediaInfo_CLI_Windows_x64

rem --- Copying : Exe ---
xcopy ..\Project\MSVC2015\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S
xcopy ..\Project\MSVC2017\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S

rem --- Copying : Plugins ---
xcopy ..\Source\Resource\Plugin\Custom\* MediaInfo_CLI_Windows_x64\Plugin\Custom\ /S
Expand Down
4 changes: 2 additions & 2 deletions Release/Release_GUI_Windows_i386.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ copy BCB\GUI\MediaInfo_GUI.exe BCB\GUI\MediaInfo.exe

@rem --- Copying : Exe ---
copy ..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_i386\MediaInfo.exe
copy ..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\MediaInfo_i386.dll
xcopy ..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S
copy ..\..\MediaInfoLib\Project\MSVC2017\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\MediaInfo_i386.dll
xcopy ..\..\MediaInfoLib\Project\MSVC2017\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S

@rem --- Copying : Plugins ---
xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_i386\Plugin\ /S
Expand Down
6 changes: 3 additions & 3 deletions Release/Release_GUI_Windows_x64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ mkdir MediaInfo_GUI_Windows_x64

@rem --- Copying : Exe ---
copy ..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_x64\MediaInfo.exe
xcopy ..\..\MediaInfoLib\Project\MSVC2015\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S
copy ..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\MediaInfo_i386.dll
xcopy ..\..\MediaInfoLib\Project\MSVC2015\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S
xcopy ..\..\MediaInfoLib\Project\MSVC2017\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S
copy ..\..\MediaInfoLib\Project\MSVC2017\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\MediaInfo_i386.dll
xcopy ..\..\MediaInfoLib\Project\MSVC2017\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S

@rem --- Copying : Plugins ---
xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_x64\Plugin\ /S
Expand Down
10 changes: 5 additions & 5 deletions Source/Install/MediaInfo_GUI_Windows.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@ Section "SectionPrincipale" SEC01
CreateShortCut "$SMPROGRAMS\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "Convenient unified display of the most relevant technical and tag data for video and audio files"
SetOutPath "$INSTDIR"
File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe"
File "/oname=MediaInfo_i386.dll" "..\..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo.dll"
File "/oname=MediaInfo_i386.dll" "..\..\..\MediaInfoLib\Project\MSVC2017\Win32\Release\MediaInfo.dll"
${If} ${RunningX64}
File "..\..\..\MediaInfoLib\Project\MSVC2015\x64\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2015\x64\Release\MediaInfo.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2017\x64\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2017\x64\Release\MediaInfo.dll"
${Else}
File "..\..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2017\Win32\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2017\Win32\Release\MediaInfo.dll"
${EndIf}
File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL"
File "$%BPATH%\Windows\libcurl\curl-ca-bundle.crt"
Expand Down

0 comments on commit 9ac7d78

Please sign in to comment.