From 33221a0ffd4ccac954bb14f32aed822f2e3da772 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 17 Apr 2015 19:00:03 +0200 Subject: [PATCH] Updated project file and build script. --- x264_launcher_MSVC2013.vcxproj | 43 ++++++++++++++------------ x264_launcher_MSVC2013.vcxproj.filters | 6 ++-- z_build.bat | 22 +++++-------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/x264_launcher_MSVC2013.vcxproj b/x264_launcher_MSVC2013.vcxproj index b14d0b1..708fc44 100644 --- a/x264_launcher_MSVC2013.vcxproj +++ b/x264_launcher_MSVC2013.vcxproj @@ -56,7 +56,7 @@ Level3 Disabled WIN32;_DEBUG;QT_DEBUG;QT_DLL;QT_GUI_LIB;%(PreprocessorDefinitions) - $(SolutionDir)\..\MUtilities\include;$(SolutionDir)\tmp\$(ProjectName);$(SolutionDir)\etc\vld\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtTest;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\MUtilities\include;$(SolutionDir)\tmp\$(ProjectName);$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtTest;%(AdditionalIncludeDirectories) NoExtensions false Disabled @@ -65,12 +65,12 @@ Windows true - $(QTDIR)\lib;$(SolutionDir)etc\vld\lib\Win32;%(AdditionalLibraryDirectories) + $(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\$(Platform);%(AdditionalLibraryDirectories) QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;SensAPI.lib;%(AdditionalDependencies) x264_entry_point - del /S /Q "$(TargetDir)\Qt*.dll" + del /S /Q "$(TargetDir)\Qt*.dll" rmdir /S /Q "$(TargetDir)\toolset" rmdir /S /Q "$(TargetDir)\imageformats" @@ -87,17 +87,17 @@ copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\" copy /Y "$(SolutionDir)res\toolset\common\*.gpg" "$(TargetDir)\toolset\common\" for %%i in (QtCored4, QtGuid4, QtSvgd4, QtXmld4) do ( - copy /Y "$(QTDIR)\bin\%%i.dll" "$(TargetDir)" - copy /Y "$(QTDIR)\bin\%%i.pdb" "$(TargetDir)" + copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\bin\%%i.dll" "$(TargetDir)" + copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\bin\%%i.pdb" "$(TargetDir)" ) for %%i in (qicod4, qsvgd4, qjpegd4, qtiffd4, qgifd4) do ( - copy /Y "$(QTDIR)\plugins\imageformats\%%i.dll" "$(TargetDir)\imageformats" - copy /Y "$(QTDIR)\plugins\imageformats\%%i.pdb" "$(TargetDir)\imageformats" + copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\plugins\imageformats\%%i.dll" "$(TargetDir)\imageformats" + copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\plugins\imageformats\%%i.pdb" "$(TargetDir)\imageformats" ) -copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.dll" "$(TargetDir)" -copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.manifest" "$(TargetDir)" +copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\$(Platform)\*.dll" "$(TargetDir)" +copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\$(Platform)\*.manifest" "$(TargetDir)" @@ -116,7 +116,7 @@ copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.manifest" "$(T true true WIN32;NDEBUG;QT_NO_DEBUG;QT_DLL;QT_GUI_LIB;%(PreprocessorDefinitions) - $(SolutionDir)\..\MUtilities\include;$(SolutionDir)\tmp\$(ProjectName);$(SolutionDir)\etc\vld\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtTest;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\MUtilities\include;$(SolutionDir)\tmp\$(ProjectName);$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtTest;%(AdditionalIncludeDirectories) AnySuitable Speed true @@ -135,7 +135,7 @@ copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.manifest" "$(T false true true - $(QTDIR)\lib;%(AdditionalLibraryDirectories) + $(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\lib;%(AdditionalLibraryDirectories) QtCore4.lib;QtGui4.lib;Winmm.lib;dwmapi.lib;Psapi.lib;SensAPI.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration false @@ -159,23 +159,26 @@ copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.manifest" "$(T del /S /Q "$(TargetDir)\Qt*.dll" rmdir /S /Q "$(TargetDir)\toolset" rmdir /S /Q "$(TargetDir)\imageformats" + mkdir "$(TargetDir)\toolset\x86" mkdir "$(TargetDir)\toolset\x64" mkdir "$(TargetDir)\toolset\common" mkdir "$(TargetDir)\imageformats" + copy /Y "$(SolutionDir)res\toolset\x86\*.exe" "$(TargetDir)\toolset\x86\" copy /Y "$(SolutionDir)res\toolset\x64\*.exe" "$(TargetDir)\toolset\x64\" copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\" copy /Y "$(SolutionDir)res\toolset\common\*.gpg" "$(TargetDir)\toolset\common\" -copy /Y "$(QTDIR)\bin\QtCore4.dll" "$(TargetDir)" -copy /Y "$(QTDIR)\bin\QtGui4.dll" "$(TargetDir)" -copy /Y "$(QTDIR)\bin\QtSvg4.dll" "$(TargetDir)" -copy /Y "$(QTDIR)\bin\QtXml4.dll" "$(TargetDir)" -copy /Y "$(QTDIR)\plugins\imageformats\qico4.dll" "$(TargetDir)\imageformats" -copy /Y "$(QTDIR)\plugins\imageformats\qsvg4.dll" "$(TargetDir)\imageformats" -copy /Y "$(QTDIR)\plugins\imageformats\qjpeg4.dll" "$(TargetDir)\imageformats" -copy /Y "$(QTDIR)\plugins\imageformats\qtiff4.dll" "$(TargetDir)\imageformats" -copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" + +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtCore4.dll" "$(TargetDir)" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtGui4.dll" "$(TargetDir)" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtSvg4.dll" "$(TargetDir)" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtXml4.dll" "$(TargetDir)" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\plugins\imageformats\qico4.dll" "$(TargetDir)\imageformats" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\plugins\imageformats\qsvg4.dll" "$(TargetDir)\imageformats" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\plugins\imageformats\qjpeg4.dll" "$(TargetDir)\imageformats" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\plugins\imageformats\qtiff4.dll" "$(TargetDir)\imageformats" +copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" Copy Toolset diff --git a/x264_launcher_MSVC2013.vcxproj.filters b/x264_launcher_MSVC2013.vcxproj.filters index e37c01c..4c020d1 100644 --- a/x264_launcher_MSVC2013.vcxproj.filters +++ b/x264_launcher_MSVC2013.vcxproj.filters @@ -111,9 +111,6 @@ Generated Files - - Header Files - @@ -343,6 +340,9 @@ Header Files + + Header Files + diff --git a/z_build.bat b/z_build.bat index 1c18f42..39dbb50 100644 --- a/z_build.bat +++ b/z_build.bat @@ -4,7 +4,6 @@ REM // Set Paths REM /////////////////////////////////////////////////////////////////////////// set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 12.0\VC" set "NSIS_PATH=C:\Program Files\NSIS\Unicode" -set "QTVC_PATH=C:\Qt\4.8.5" set "UPX3_PATH=C:\Program Files\UPX" set "PDOC_PATH=C:\Program Files\Pandoc" @@ -12,12 +11,9 @@ REM ############################################### REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! # REM ############################################### - REM /////////////////////////////////////////////////////////////////////////// REM // Setup environment REM /////////////////////////////////////////////////////////////////////////// -if exist "%QTVC_PATH%\bin\qtvars.bat" ( call "%QTVC_PATH%\bin\qtvars.bat" ) -if exist "%QTVC_PATH%\bin\qtenv2.bat" ( call "%QTVC_PATH%\bin\qtenv2.bat" ) call "%MSVC_PATH%\vcvarsall.bat" x86 REM /////////////////////////////////////////////////////////////////////////// @@ -35,10 +31,6 @@ if not exist "%VCINSTALLDIR%\bin\cl.exe" ( echo C++ compiler not found. Please check your MSVC_PATH var! goto BuildError ) -if not exist "%QTDIR%\bin\moc.exe" ( - echo Qt meta compiler not found. Please check your QTVC_PATH var! - goto BuildError -) if not exist "%PDOC_PATH%\pandoc.exe" ( echo Pandoc binary could not be found. Please check your PDOC_PATH var! goto BuildError @@ -112,13 +104,13 @@ for %%i in (100, 110, 120) do ( copy "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\msvc?%%i.dll" "%PACK_PATH%" ) ) -copy "%QTVC_PATH%\bin\QtCore4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtGui4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtSvg4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtXml4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtXml4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats" -del "%PACK_PATH%\imageformats\*d4.dll" +copy "%~dp0\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtCore4.dll" "%PACK_PATH%" +copy "%~dp0\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtGui4.dll" "%PACK_PATH%" +copy "%~dp0\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtSvg4.dll" "%PACK_PATH%" +copy "%~dp0\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtXml4.dll" "%PACK_PATH%" +copy "%~dp0\..\Prerequisites\Qt4\MSVC-2013\Shared\bin\QtXml4.dll" "%PACK_PATH%" +copy "%~dp0\..\Prerequisites\Qt4\MSVC-2013\Shared\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats" +del "%PACK_PATH%\imageformats\*d4.dll" 2> NUL REM /////////////////////////////////////////////////////////////////////////// REM // Generate Docs