OSDN Git Service

(root) / x264-launcher / x264-launcher.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f80533f)
Updated the VS2012 project file.
authorlordmulder <mulder2@gmx.de>
Sun, 20 Apr 2014 16:06:21 +0000 (18:06 +0200)
committerlordmulder <mulder2@gmx.de>
Sun, 20 Apr 2014 16:06:21 +0000 (18:06 +0200)
src/version.h patch | blob | history
x264_launcher_MSVC2012.vcxproj patch | blob | history
x264_launcher_MSVC2012.vcxproj.filters patch | blob | history

diff --git a/src/version.h b/src/version.h
index 410c1c2..359bec5 100644 (file)
--- 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 843
+#define VER_X264_BUILD 844
 
 #define VER_X264_PORTABLE_EDITION (0)
 
diff --git a/x264_launcher_MSVC2012.vcxproj b/x264_launcher_MSVC2012.vcxproj
index 739735a..fb9d520 100644 (file)
--- a/x264_launcher_MSVC2012.vcxproj
+++ b/x264_launcher_MSVC2012.vcxproj
@@ -73,11 +73,14 @@ 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\x86\*.dll" "$(TargetDir)\toolset\x86\"
 copy /Y "$(SolutionDir)res\toolset\x64\*.exe" "$(TargetDir)\toolset\x64\"
 copy /Y "$(SolutionDir)res\toolset\x64\*.dll" "$(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\QtCored4.dll" "$(TargetDir)"
 copy /Y "$(QTDIR)\bin\QtGuid4.dll" "$(TargetDir)"
 copy /Y "$(QTDIR)\bin\QtSvgd4.dll" "$(TargetDir)"
@@ -88,8 +91,7 @@ copy /Y "$(QTDIR)\plugins\imageformats\qjpegd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(QTDIR)\plugins\imageformats\qtiffd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(QTDIR)\plugins\imageformats\qgifd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.dll" "$(TargetDir)"
-copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"
-</Command>
+copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Copy Toolset</Message>
@@ -152,9 +154,12 @@ 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)"
@@ -264,6 +269,14 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats"
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="src\input_filter.h">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
     <ClInclude Include="src\job_object.h" />
     <CustomBuild Include="src\model_jobList.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)"</Command>
@@ -281,6 +294,7 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats"
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <ClInclude Include="src\mediainfo.h" />
     <ClInclude Include="src\model_options.h" />
     <ClInclude Include="src\model_preferences.h" />
     <ClInclude Include="src\model_recently.h" />
@@ -401,9 +415,11 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats"
     <ClCompile Include="src\encoder_x264.cpp" />
     <ClCompile Include="src\encoder_x265.cpp" />
     <ClCompile Include="src\global.cpp" />
+    <ClCompile Include="src\input_filter.cpp" />
     <ClCompile Include="src\ipc.cpp" />
     <ClCompile Include="src\job_object.cpp" />
     <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\mediainfo.cpp" />
     <ClCompile Include="src\model_jobList.cpp" />
     <ClCompile Include="src\model_logFile.cpp" />
     <ClCompile Include="src\model_options.cpp" />
@@ -425,6 +441,7 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats"
     <ClCompile Include="src\win_main.cpp" />
     <ClCompile Include="src\win_preferences.cpp" />
     <ClCompile Include="src\win_updater.cpp" />
+    <ClCompile Include="tmp\moc\moc_input_filter.cpp" />
     <ClCompile Include="tmp\moc\moc_ipc.cpp" />
     <ClCompile Include="tmp\moc\moc_model_jobList.cpp" />
     <ClCompile Include="tmp\moc\moc_model_logFile.cpp" />
diff --git a/x264_launcher_MSVC2012.vcxproj.filters b/x264_launcher_MSVC2012.vcxproj.filters
index d7e7c39..368dec1 100644 (file)
--- a/x264_launcher_MSVC2012.vcxproj.filters
+++ b/x264_launcher_MSVC2012.vcxproj.filters
@@ -34,12 +34,6 @@
     <None Include="res\icons\movie.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="gui\win_about.ui">
-      <Filter>Dialogs</Filter>
-    </None>
-    <None Include="gui\win_updater.ui">
-      <Filter>Dialogs</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\3rd_party\blake2.h">
@@ -72,18 +66,9 @@
     <ClInclude Include="src\global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\job_object.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\model_jobList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\model_logFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\model_options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -117,43 +102,10 @@
     <ClInclude Include="src\taskbar7.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\thread_avisynth.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thread_encode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thread_updater.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thread_vapoursynth.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\tool_abstract.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\win_about.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\win_addJob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\win_editor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\win_help.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\win_main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\win_preferences.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\win_updater.h">
+    <ClInclude Include="src\mediainfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -308,6 +260,15 @@
     <ClCompile Include="tmp\moc\moc_win_updater.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\mediainfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\input_filter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="tmp\moc\moc_input_filter.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="res\resources.qrc">
@@ -328,6 +289,56 @@
     <CustomBuild Include="gui\win_editor.ui">
       <Filter>Dialogs</Filter>
     </CustomBuild>
+    <CustomBuild Include="gui\win_about.ui" />
+    <CustomBuild Include="gui\win_updater.ui" />
+    <CustomBuild Include="src\ipc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\model_jobList.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\model_logFile.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\thread_avisynth.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\thread_encode.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\thread_updater.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\thread_vapoursynth.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\tool_abstract.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_about.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_addJob.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_editor.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_help.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_main.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_preferences.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\win_updater.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="src\input_filter.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="x264_launcher.rc">
Simple x264 Launcher development repository
About OSDN
Find Software
Develop Software
Help