From 1cabbdc7b5da829a99b744fd9cc5bca2f1647777 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 18 Apr 2014 21:22:10 +0200 Subject: [PATCH] Updated Visual Studio 2012 project file. --- src/global.cpp | 4 +- src/version.h | 2 +- x264_launcher_MSVC2012.vcxproj | 205 +++++++++++----- x264_launcher_MSVC2012.vcxproj.filters | 316 +++++++++++++++++-------- 4 files changed, 370 insertions(+), 157 deletions(-) diff --git a/src/global.cpp b/src/global.cpp index fff821a..9da66d0 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -268,8 +268,10 @@ static inline bool _CHECK_FLAG(const int argc, char **argv, const char *flag) static const char *g_x264_version_compiler = "MSVC 2012.1"; #elif (_MSC_FULL_VER < 170060610) static const char *g_x264_version_compiler = "MSVC 2012.2"; - #elif (_MSC_FULL_VER == 170060610) + #elif (_MSC_FULL_VER < 170061030) static const char *g_x264_version_compiler = "MSVC 2012.3"; + #elif (_MSC_FULL_VER == 170061030) + static const char *g_x264_version_compiler = "MSVC 2012.4"; #else #error Compiler version is not supported yet! #endif diff --git a/src/version.h b/src/version.h index 86f6e3c..2d70e12 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 3 #define VER_X264_PATCH 7 -#define VER_X264_BUILD 829 +#define VER_X264_BUILD 836 #define VER_X264_PORTABLE_EDITION (0) diff --git a/x264_launcher_MSVC2012.vcxproj b/x264_launcher_MSVC2012.vcxproj index 1c91e19..739735a 100644 --- a/x264_launcher_MSVC2012.vcxproj +++ b/x264_launcher_MSVC2012.vcxproj @@ -58,12 +58,14 @@ WIN32;_DEBUG;QT_DEBUG;QT_DLL;QT_GUI_LIB;%(PreprocessorDefinitions) $(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtTest;$(SolutionDir)tmp\uic;$(SolutionDir)etc\vld\include;%(AdditionalIncludeDirectories) NoExtensions + false Windows true $(QTDIR)\lib;$(SolutionDir)etc\vld\lib\Win32;%(AdditionalLibraryDirectories) - QtCored4.lib;QtGuid4.lib;Winmm.lib;psapi.lib;%(AdditionalDependencies) + QtCored4.lib;QtGuid4.lib;Winmm.lib;psapi.lib;SensAPI.lib;%(AdditionalDependencies) + x264_entry_point del /S /Q "$(TargetDir)\*.dll" @@ -117,6 +119,7 @@ copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)" false true false + false Windows @@ -124,9 +127,10 @@ copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)" true true $(QTDIR)\lib;%(AdditionalLibraryDirectories) - QtCore4.lib;QtGui4.lib;Winmm.lib;%(AdditionalDependencies) + QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;SensAPI.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration false + x264_entry_point "$(SolutionDir)etc\auto_inc.exe" VER_X264_BUILD "$(SolutionDir)src\version.h" 5 @@ -210,6 +214,24 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" $(SolutionDir)tmp\uic\uic_%(Filename).h;%(Outputs) $(SolutionDir)tmp\uic\uic_%(Filename).h;%(Outputs) + + Document + "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\uic\uic_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\uic\uic_%(Filename).h" "%(FullPath)" + UIC "$(SolutionDir)tmp\uic\uic_%(Filename).h" + UIC "$(SolutionDir)tmp\uic\uic_%(Filename).h" + $(SolutionDir)tmp\uic\uic_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\uic\uic_%(Filename).h;%(Outputs) + + + Document + "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\uic\uic_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\uic\uic_%(Filename).h" "%(FullPath)" + UIC "$(SolutionDir)tmp\uic\uic_%(Filename).h" + UIC "$(SolutionDir)tmp\uic\uic_%(Filename).h" + $(SolutionDir)tmp\uic\uic_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\uic\uic_%(Filename).h;%(Outputs) + Document @@ -224,48 +246,25 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - - + + + + + + + + + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" @@ -286,25 +285,46 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" + + + + + - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" - MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" @@ -313,6 +333,38 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" @@ -321,40 +373,73 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" + $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + + + + + + + + + + + + - - false - false - + + + - - - + + + + + - + + + + diff --git a/x264_launcher_MSVC2012.vcxproj.filters b/x264_launcher_MSVC2012.vcxproj.filters index 78e5c17..d7e7c39 100644 --- a/x264_launcher_MSVC2012.vcxproj.filters +++ b/x264_launcher_MSVC2012.vcxproj.filters @@ -22,32 +22,71 @@ {2c9c8836-2259-4412-894e-7cc32bef99de} + + {f35d7317-a03a-4c92-ae9d-a4f32f7eab17} + + + {9f7ba28d-1bc5-46da-a431-78773725a67d} + Resource Files + + Dialogs + + + Dialogs + + + Header Files\3rd Party + + + Header Files\3rd Party + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + Header Files - + Header Files - + Header Files - + + Header Files + + Header Files Header Files - - Header Files - Header Files @@ -57,151 +96,238 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + - + + Generated Files + + + Source Files\3rd Party + + + Source Files\3rd Party + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files Source Files - + Source Files - - Generated Files - - - Generated Files - - + Source Files - - Generated Files + + Source Files Source Files - - Generated Files - Source Files - - Generated Files - - - Source Files - - - Generated Files - Source Files - - Source Files - - - Generated Files - - - Source Files - - - Generated Files - - - Source Files - - - Source Files - - - Generated Files - - - Source Files - - - Generated Files - - - Source Files - - - Source Files - - - Generated Files - Source Files Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + Generated Files + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + - - Header Files - Resource Files - - Header Files - - - Header Files - - - Header Files - Dialogs - - Header Files - Dialogs - - Header Files - Dialogs - - Header Files - Dialogs Dialogs - - Header Files - - - Header Files - - - Header Files -