From 3bd033a6b8b015b2ba02fab518cd887a9da9f8a3 Mon Sep 17 00:00:00 2001 From: JeromeMartinez Date: Sun, 2 May 2010 05:13:59 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/mediainfo/code/MediaInfo/trunk@3067 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da --- Release/Release_CLI_Windows_i386.bat | 2 +- Release/Release_CLI_Windows_x64.bat | 2 +- Release/Release_GUI_Windows_i386.bat | 2 +- Release/Release_GUI_Windows_x64.bat | 4 ++-- Source/Install/MediaInfo_GUI_Windows_i386.nsi | 2 +- Source/Install/MediaInfo_GUI_Windows_x64.nsi | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Release/Release_CLI_Windows_i386.bat b/Release/Release_CLI_Windows_i386.bat index 07d26e0d9..7b4abb02f 100644 --- a/Release/Release_CLI_Windows_i386.bat +++ b/Release/Release_CLI_Windows_i386.bat @@ -6,7 +6,7 @@ rmdir MediaInfo_CLI_Windows_i386 /S /Q mkdir MediaInfo_CLI_Windows_i386 rem --- Copying : Exe --- -xcopy ..\Project\MSVC\CLI\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S +xcopy ..\Project\MSVC2008\CLI\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S xcopy ..\..\MediaInfoLib\Project\MSVC2005\DLL\Win32\Release\MediaInfo.dll MediaInfo_CLI_Windows_i386\ /S rem --- Copying : Plugins --- diff --git a/Release/Release_CLI_Windows_x64.bat b/Release/Release_CLI_Windows_x64.bat index 78d854a78..496071d4d 100644 --- a/Release/Release_CLI_Windows_x64.bat +++ b/Release/Release_CLI_Windows_x64.bat @@ -6,7 +6,7 @@ rmdir MediaInfo_CLI_Windows_x64 /S /Q mkdir MediaInfo_CLI_Windows_x64 rem --- Copying : Exe --- -xcopy ..\Project\MSVC\CLI\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S +xcopy ..\Project\MSVC2010\CLI\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S xcopy ..\..\MediaInfoLib\Project\MSVC\DLL\x64\Release\MediaInfo.dll MediaInfo_CLI_Windows_x64\ /S rem --- Copying : Plugins --- diff --git a/Release/Release_GUI_Windows_i386.bat b/Release/Release_GUI_Windows_i386.bat index 2a0ee2868..ce74d6a4d 100644 --- a/Release/Release_GUI_Windows_i386.bat +++ b/Release/Release_GUI_Windows_i386.bat @@ -13,7 +13,7 @@ copy BCB\GUI\MediaInfo_GUI.exe BCB\GUI\MediaInfo.exe @rem --- Copying : Exe --- copy ..\Project\BCB\GUI\Release_Build\MediaInfo_GUI.exe MediaInfo_GUI_Windows_i386\MediaInfo.exe xcopy ..\..\MediaInfoLib\Project\MSVC2005\DLL\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\ /S -xcopy ..\..\MediaInfoLib\Project\MSVC\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2008\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S @rem --- Copying : Plugins --- xcopy ..\Source\Ressource\Plugin\* MediaInfo_GUI_Windows_i386\Plugin\ /S diff --git a/Release/Release_GUI_Windows_x64.bat b/Release/Release_GUI_Windows_x64.bat index 463b96b00..bc40a4fd7 100644 --- a/Release/Release_GUI_Windows_x64.bat +++ b/Release/Release_GUI_Windows_x64.bat @@ -9,9 +9,9 @@ mkdir MediaInfo_GUI_Windows_x64 @rem --- Copying : Exe --- copy ..\Project\BCB\GUI\Release_Build\MediaInfo_GUI_x64.exe MediaInfo_GUI_Windows_x64\MediaInfo.exe -xcopy ..\..\MediaInfoLib\Project\MSVC\DLL\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2010\DLL\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S copy ..\..\MediaInfoLib\Project\MSVC2005\DLL\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\MediaInfo_i386.dll -xcopy ..\..\MediaInfoLib\Project\MSVC\ShellExtension\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2010\ShellExtension\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S @rem --- Copying : Plugins --- xcopy ..\Source\Ressource\Plugin\* MediaInfo_GUI_Windows_x64\Plugin\ /S diff --git a/Source/Install/MediaInfo_GUI_Windows_i386.nsi b/Source/Install/MediaInfo_GUI_Windows_i386.nsi index 89bcb52d4..38214d1fe 100644 --- a/Source/Install/MediaInfo_GUI_Windows_i386.nsi +++ b/Source/Install/MediaInfo_GUI_Windows_i386.nsi @@ -109,7 +109,7 @@ Section "SectionPrincipale" SEC01 CreateDirectory "$SMPROGRAMS\MediaInfo" CreateShortCut "$SMPROGRAMS\MediaInfo\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "MediaInfo ${PRODUCT_VERSION}" File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Release_Build\MediaInfo_GUI.exe" - File "..\..\..\MediaInfoLib\Project\MSVC\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2008\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll" File "..\..\..\MediaInfoLib\Project\MSVC2005\DLL\Win32\Release\MediaInfo.dll" File "/oname=History.txt" "..\..\History_GUI.txt" File "..\..\License.html" diff --git a/Source/Install/MediaInfo_GUI_Windows_x64.nsi b/Source/Install/MediaInfo_GUI_Windows_x64.nsi index 2aa76a760..a50b7929f 100644 --- a/Source/Install/MediaInfo_GUI_Windows_x64.nsi +++ b/Source/Install/MediaInfo_GUI_Windows_x64.nsi @@ -109,8 +109,8 @@ Section "SectionPrincipale" SEC01 CreateDirectory "$SMPROGRAMS\MediaInfo" CreateShortCut "$SMPROGRAMS\MediaInfo\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "MediaInfo ${PRODUCT_VERSION}" File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Release_Build\MediaInfo_GUI_x64.exe" - File "..\..\..\MediaInfoLib\Project\MSVC\ShellExtension\x64\Release\MediaInfo_InfoTip.dll" - File "..\..\..\MediaInfoLib\Project\MSVC\DLL\x64\Release\MediaInfo.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2010\ShellExtension\x64\Release\MediaInfo_InfoTip.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2010\DLL\x64\Release\MediaInfo.dll" File "/oname=MediaInfo_i386.dll""..\..\..\MediaInfoLib\Project\MSVC2005\DLL\Win32\Release\MediaInfo.dll" File "/oname=History.txt" "..\..\History_GUI.txt" File "..\..\License.html"