Merge pull request MediaArea#28 from JeromeMartinez/MSVC2015

Update of Windows build scripts for using MSVC2015
a-j-albert · Feb 29, 2016 · 2447537 · 2447537
2 parents a328273 + 8ebb212
commit 2447537
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/Project/MSVC2015/GUI/MediaInfo_GUI.vcxproj b/Project/MSVC2015/GUI/MediaInfo_GUI.vcxproj
@@ -89,6 +89,7 @@
       <AdditionalIncludeDirectories>../../../Source;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;../../../../wxWidgets/include;../../../../wxWidgets/lib/vc_x64_lib\mswud;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>MEDIAINFO_ADVANCED2_NO;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>../../../../wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

diff --git a/Release/Release_CLI_Windows_i386.bat b/Release/Release_CLI_Windows_i386.bat
@@ -12,8 +12,7 @@ rmdir MediaInfo_CLI_Windows_i386 /S /Q
 mkdir MediaInfo_CLI_Windows_i386
 
 rem --- Copying : Exe ---
-xcopy ..\Project\MSVC2013\CLI\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S
-xcopy ..\..\MediaInfoLib\Project\MSVC2013\DLL\Win32\Release\MediaInfo.dll MediaInfo_CLI_Windows_i386\ /S
+xcopy ..\Project\MSVC2015\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S
 
 rem --- Copying : Plugins ---
 xcopy ..\Source\Resource\Plugin\Custom\* MediaInfo_CLI_Windows_i386\Plugin\Custom\ /S

diff --git a/Release/Release_CLI_Windows_x64.bat b/Release/Release_CLI_Windows_x64.bat
@@ -12,8 +12,7 @@ rmdir MediaInfo_CLI_Windows_x64 /S /Q
 mkdir MediaInfo_CLI_Windows_x64
 
 rem --- Copying : Exe ---
-xcopy ..\Project\MSVC2013\CLI\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S
-xcopy ..\..\MediaInfoLib\Project\MSVC2013\DLL\x64\Release\MediaInfo.dll MediaInfo_CLI_Windows_x64\ /S
+xcopy ..\Project\MSVC2015\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S
 
 rem --- Copying : Plugins ---
 xcopy ..\Source\Resource\Plugin\Custom\* MediaInfo_CLI_Windows_x64\Plugin\Custom\ /S

diff --git a/Release/Release_GUI_Windows_i386.bat b/Release/Release_GUI_Windows_i386.bat
@@ -18,8 +18,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\MSVC2013\DLL\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\MediaInfo_i386.dll
-xcopy ..\..\MediaInfoLib\Project\MSVC2013\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S
+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
 
 @rem --- Copying : Plugins ---
 xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_i386\Plugin\ /S

diff --git a/Release/Release_GUI_Windows_x64.bat b/Release/Release_GUI_Windows_x64.bat
@@ -15,9 +15,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\MSVC2013\DLL\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S
-copy  ..\..\MediaInfoLib\Project\MSVC2013\DLL\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\MediaInfo_i386.dll
-xcopy ..\..\MediaInfoLib\Project\MSVC2013\ShellExtension\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S
+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
 
 @rem --- Copying : Plugins ---
 xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_x64\Plugin\ /S

diff --git a/Source/Install/MediaInfo_GUI_Windows.nsi b/Source/Install/MediaInfo_GUI_Windows.nsi
@@ -116,13 +116,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\MSVC2013\Win32\Release\MediaInfo.dll"
+  File "/oname=MediaInfo_i386.dll" "..\..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo.dll"
   ${If} ${RunningX64}
-    File "..\..\..\MediaInfoLib\Project\MSVC2013\x64\Release\MediaInfo_InfoTip.dll"
-    File "..\..\..\MediaInfoLib\Project\MSVC2013\x64\Release\MediaInfo.dll"
+    File "..\..\..\MediaInfoLib\Project\MSVC2015\x64\Release\MediaInfo_InfoTip.dll"
+    File "..\..\..\MediaInfoLib\Project\MSVC2015\x64\Release\MediaInfo.dll"
   ${Else}
-    File "..\..\..\MediaInfoLib\Project\MSVC2013\Win32\Release\MediaInfo_InfoTip.dll"
-    File "..\..\..\MediaInfoLib\Project\MSVC2013\Win32\Release\MediaInfo.dll"
+    File "..\..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo_InfoTip.dll"
+    File "..\..\..\MediaInfoLib\Project\MSVC2015\Win32\Release\MediaInfo.dll"
   ${EndIf}
   File "/oname=History.txt" "..\..\History_GUI.txt"
   File "..\..\License.html"