X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=x264_launcher_MSVC2015.vcxproj;h=05d37584658bfe175e049b3c436e499714dada09;hb=cd26a4c2a166eb05c2b31d8a47ac4581d24fbfdc;hp=423cbd747e43cfd7ab9ffb0be92b597fe757acbc;hpb=5fd4e486cbba7336226ac4e7e3696db74a2b0295;p=x264-launcher%2Fx264-launcher.git

diff --git a/x264_launcher_MSVC2015.vcxproj b/x264_launcher_MSVC2015.vcxproj
index 423cbd7..05d3758 100644
--- a/x264_launcher_MSVC2015.vcxproj
+++ b/x264_launcher_MSVC2015.vcxproj
@@ -35,9 +35,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="x264_launcher.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="x264_launcher.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -74,17 +76,23 @@
 rmdir /S /Q "$(TargetDir)\toolset"
 rmdir /S /Q "$(TargetDir)\imageformats"
 
+mkdir "$(TargetDir)\toolset\common"
 mkdir "$(TargetDir)\toolset\x86"
 mkdir "$(TargetDir)\toolset\x64"
-mkdir "$(TargetDir)\toolset\common"
+mkdir "$(TargetDir)\toolset\x86\nvencc"
+mkdir "$(TargetDir)\toolset\x64\nvencc"
 mkdir "$(TargetDir)\imageformats"
 
+copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\"
+copy /Y "$(SolutionDir)res\toolset\common\*.crt" "$(TargetDir)\toolset\common\"
 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\x86\*.dll" "$(TargetDir)\toolset\x86\"
 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 "$(SolutionDir)res\toolset\x86\nvencc\*.exe" "$(TargetDir)\toolset\x86\nvencc"
+copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.exe" "$(TargetDir)\toolset\x64\nvencc"
+copy /Y "$(SolutionDir)res\toolset\x86\nvencc\*.dll" "$(TargetDir)\toolset\x86\nvencc"
+copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.dll" "$(TargetDir)\toolset\x64\nvencc"
 
 for %%i in (QtCored4, QtGuid4, QtSvgd4, QtXmld4) do (
     copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\bin\%%i.dll" "$(TargetDir)"
@@ -160,17 +168,23 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\$(Platform)\*.ma
 rmdir /S /Q "$(TargetDir)\toolset"
 rmdir /S /Q "$(TargetDir)\imageformats"
 
+mkdir "$(TargetDir)\toolset\common"
 mkdir "$(TargetDir)\toolset\x86"
 mkdir "$(TargetDir)\toolset\x64"
-mkdir "$(TargetDir)\toolset\common"
+mkdir "$(TargetDir)\toolset\x86\nvencc"
+mkdir "$(TargetDir)\toolset\x64\nvencc"
 mkdir "$(TargetDir)\imageformats"
 
+copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\"
+copy /Y "$(SolutionDir)res\toolset\common\*.crt" "$(TargetDir)\toolset\common\"
 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\x86\*.dll" "$(TargetDir)\toolset\x86\"
 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 "$(SolutionDir)res\toolset\x86\nvencc\*.exe" "$(TargetDir)\toolset\x86\nvencc"
+copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.exe" "$(TargetDir)\toolset\x64\nvencc"
+copy /Y "$(SolutionDir)res\toolset\x86\nvencc\*.dll" "$(TargetDir)\toolset\x86\nvencc"
+copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.dll" "$(TargetDir)\toolset\x64\nvencc"
 
 copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\bin\QtCore4.dll" "$(TargetDir)"
 copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\bin\QtGui4.dll"  "$(TargetDir)"
@@ -249,7 +263,6 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\UIC_%(Filename).h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\UIC_%(Filename).h;%(Outputs)</Outputs>
     </CustomBuild>
-    <None Include="ReadMe.txt" />
     <CustomBuild Include="res\resources.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
@@ -260,6 +273,15 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <SubType>Designer</SubType>
     </CustomBuild>
+    <CustomBuild Include="etc\style\qdarkstyle\style.qrc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
     <None Include="res\icons\movie.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -287,9 +309,26 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <ClInclude Include="src\encoder_nvenc.h" />
+    <ClInclude Include="src\encoder_nvencc.h" />
     <ClInclude Include="src\model_clipInfo.h" />
     <ClInclude Include="src\source_factory.h" />
+    <ClInclude Include="src\string_validator.h" />
+    <CustomBuild Include="src\thread_startup.h">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="src\thread_abstract.h">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
     <ClInclude Include="tmp\x264_launcher\UIC_win_about.h" />
     <ClInclude Include="tmp\x264_launcher\UIC_win_addJob.h" />
     <ClInclude Include="tmp\x264_launcher\UIC_win_editor.h" />
@@ -432,7 +471,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
   <ItemGroup>
     <ClCompile Include="src\encoder_abstract.cpp" />
     <ClCompile Include="src\encoder_factory.cpp" />
-    <ClCompile Include="src\encoder_nvenc.cpp" />
+    <ClCompile Include="src\encoder_nvencc.cpp" />
     <ClCompile Include="src\encoder_x264.cpp" />
     <ClCompile Include="src\encoder_x265.cpp" />
     <ClCompile Include="src\job_object.cpp" />
@@ -448,6 +487,8 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
     <ClCompile Include="src\source_avisynth.cpp" />
     <ClCompile Include="src\source_factory.cpp" />
     <ClCompile Include="src\source_vapoursynth.cpp" />
+    <ClCompile Include="src\string_validator.cpp" />
+    <ClCompile Include="src\thread_abstract.cpp" />
     <ClCompile Include="src\thread_avisynth.cpp" />
     <ClCompile Include="src\thread_binaries.cpp" />
     <ClCompile Include="src\thread_encode.cpp" />
@@ -455,6 +496,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
     <ClCompile Include="src\main.cpp" />
     <ClCompile Include="src\thread_ipc_recv.cpp" />
     <ClCompile Include="src\thread_ipc_send.cpp" />
+    <ClCompile Include="src\thread_startup.cpp" />
     <ClCompile Include="src\thread_vapoursynth.cpp" />
     <ClCompile Include="src\tool_abstract.cpp" />
     <ClCompile Include="src\win_about.cpp" />
@@ -468,11 +510,13 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
     <ClCompile Include="tmp\x264_launcher\MOC_input_filter.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_model_jobList.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_model_logFile.cpp" />
+    <ClCompile Include="tmp\x264_launcher\MOC_thread_abstract.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_thread_avisynth.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_thread_binaries.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_thread_encode.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_thread_ipc_recv.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_thread_ipc_send.cpp" />
+    <ClCompile Include="tmp\x264_launcher\MOC_thread_startup.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_thread_vapoursynth.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_tool_abstract.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_win_about.cpp" />
@@ -483,6 +527,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
     <ClCompile Include="tmp\x264_launcher\MOC_win_preferences.cpp" />
     <ClCompile Include="tmp\x264_launcher\MOC_win_updater.cpp" />
     <ClCompile Include="tmp\x264_launcher\QRC_resources.cpp" />
+    <ClCompile Include="tmp\x264_launcher\QRC_style.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="x264_launcher.rc" />