Skip to content

Commit f8ee351

Browse files
DaGooseYTDaGooseYT
authored
v1.1.7
1 parent fcedc25 commit f8ee351

4 files changed

+59
-34
lines changed

‎EncodeGUI.sln

+4-10
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,14 @@ Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Debug|x64 = Debug|x64
12-
Release_Linux|Any CPU = Release_Linux|Any CPU
13-
Release_Linux|x64 = Release_Linux|x64
1412
Release|Any CPU = Release|Any CPU
1513
Release|x64 = Release|x64
1614
EndGlobalSection
1715
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|Any CPU.ActiveCfg = Release|x64
19-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|Any CPU.Build.0 = Release|x64
20-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|x64.ActiveCfg = Release|x64
21-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|x64.Build.0 = Release|x64
22-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release_Linux|Any CPU.ActiveCfg = Release_Linux|x64
23-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release_Linux|Any CPU.Build.0 = Release_Linux|x64
24-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release_Linux|x64.ActiveCfg = Release_Linux|x64
25-
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release_Linux|x64.Build.0 = Release_Linux|x64
16+
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|Any CPU.ActiveCfg = Debug|x64
17+
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|Any CPU.Build.0 = Debug|x64
18+
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|x64.ActiveCfg = Debug|x64
19+
{098B73F3-16E7-4914-A051-CA4327E63F49}.Debug|x64.Build.0 = Debug|x64
2620
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release|Any CPU.ActiveCfg = Release|x64
2721
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release|Any CPU.Build.0 = Release|x64
2822
{098B73F3-16E7-4914-A051-CA4327E63F49}.Release|x64.ActiveCfg = Release|x64

‎EncodeGUI.vcxproj

+35-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|x64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Release|x64">
59
<Configuration>Release</Configuration>
610
<Platform>x64</Platform>
@@ -13,7 +17,7 @@
1317
<PropertyGroup Label="Globals">
1418
<ProjectGuid>{098B73F3-16E7-4914-A051-CA4327E63F49}</ProjectGuid>
1519
<Keyword>QtVS_v304</Keyword>
16-
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0.19041.0</WindowsTargetPlatformVersion>
20+
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0</WindowsTargetPlatformVersion>
1721
<ApplicationType Condition="'$(Configuration)|$(Platform)' == 'Release_linux|x64'">Linux</ApplicationType>
1822
<ApplicationTypeRevision Condition="'$(Configuration)|$(Platform)' == 'Release_linux|x64'">1.0</ApplicationTypeRevision>
1923
<TargetLinuxPlatform Condition="'$(Configuration)|$(Platform)' == 'Release_linux|x64'">Generic</TargetLinuxPlatform>
@@ -32,6 +36,9 @@
3236
<RemoteCopyIncludeDirectories>
3337
</RemoteCopyIncludeDirectories>
3438
</PropertyGroup>
39+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
40+
<PlatformToolset>v143</PlatformToolset>
41+
</PropertyGroup>
3542
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3643
<ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
3744
<Import Project="$(QtMsBuild)\qt_defaults.props" />
@@ -66,13 +73,23 @@
6673
</ImportGroup>
6774
<PropertyGroup Label="UserMacros" />
6875
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
76+
<IncludePath>$(ProjectDir)\include;$(IncludePath)</IncludePath>
6977
</PropertyGroup>
7078
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_linux|x64'">
7179
<ProjectPublicIncludePath>C:\Users\Goose\AppData\Local\Microsoft\Linux\HeaderCache\1.0\-2016259881\home\goose\Qt\6.4.0\gcc_64\include;C:\Users\Goose\AppData\Local\Microsoft\Linux\HeaderCache\1.0\-2016259881\usr\include;$(ProjectPublicIncludePath)</ProjectPublicIncludePath>
7280
<IncludePath>
7381
</IncludePath>
7482
<RemoteCopySourceMethod>rsync</RemoteCopySourceMethod>
7583
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
85+
<IncludePath>$(ProjectDir)\include;$(IncludePath)</IncludePath>
86+
</PropertyGroup>
87+
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
88+
<QtDeploy>false</QtDeploy>
89+
<QtBuildConfig>debug</QtBuildConfig>
90+
<QtInstall>6.2.4</QtInstall>
91+
<QtModules>core;gui;network;widgets</QtModules>
92+
</PropertyGroup>
7693
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_linux|x64'">
7794
<ClCompile>
7895
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -88,7 +105,14 @@
88105
</ItemDefinitionGroup>
89106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90107
<QtUic>
91-
<ExecutionDescription />
108+
<QtUicFileName>ui_%(Filename).hpp</QtUicFileName>
109+
</QtUic>
110+
</ItemDefinitionGroup>
111+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
112+
<QtUic>
113+
<QtUicFileName>ui_%(Filename).hpp</QtUicFileName>
114+
<QtUicDir>$(ProjectDir)\include\windows</QtUicDir>
115+
<ExecutionDescription>uic %(Identity)</ExecutionDescription>
92116
</QtUic>
93117
</ItemDefinitionGroup>
94118
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
@@ -111,15 +135,15 @@
111135
</ItemDefinitionGroup>
112136
<ItemGroup>
113137
<ClCompile Include="src\args\audioargs.cpp" />
138+
<ClCompile Include="src\args\bitrate.cpp" />
139+
<ClCompile Include="src\args\chapters.cpp" />
114140
<ClCompile Include="src\args\codec.cpp" />
115141
<ClCompile Include="src\args\colorsargs.cpp" />
116142
<ClCompile Include="src\args\entropy.cpp" />
117143
<ClCompile Include="src\args\frame.cpp" />
118144
<ClCompile Include="src\args\hdr.cpp" />
119-
<ClCompile Include="src\args\io.cpp" />
120145
<ClCompile Include="src\args\map.cpp" />
121146
<ClCompile Include="src\args\misc.cpp" />
122-
<ClCompile Include="src\args\mix.cpp" />
123147
<ClCompile Include="src\args\pass.cpp" />
124148
<ClCompile Include="src\args\preset.cpp" />
125149
<ClCompile Include="src\args\profile.cpp" />
@@ -153,6 +177,7 @@
153177
<ClCompile Include="src\ui\avc.cpp" />
154178
<ClCompile Include="src\ui\config.cpp" />
155179
<ClCompile Include="src\ui\encodegui.cpp" />
180+
<ClCompile Include="src\ui\enviornment.cpp" />
156181
<ClCompile Include="src\ui\hevc.cpp" />
157182
<ClCompile Include="src\ui\jobs.cpp" />
158183
<ClCompile Include="src\ui\msgbox.cpp" />
@@ -181,9 +206,9 @@
181206
<ClInclude Include="include\videoinfolist.hpp" />
182207
<ClInclude Include="include\mediaconfig.hpp" />
183208
<ClInclude Include="include\scriptbuilder.hpp" />
184-
<ClInclude Include="x64\Release\uic\ui_EncodeGUI.h" />
185-
<ClInclude Include="x64\Release\uic\ui_Preview.h" />
186-
<ClInclude Include="x64\Release\uic\ui_Updater.h" />
209+
<ClInclude Include="include\windows\ui_encodegui.hpp" />
210+
<ClInclude Include="include\windows\ui_preview.hpp" />
211+
<ClInclude Include="include\windows\ui_updater.hpp" />
187212
<QtMoc Include="include\ffloader.hpp" />
188213
<ClInclude Include="include\audiosubinforegex.hpp" />
189214
<ClInclude Include="include\processerrorregex.hpp" />
@@ -195,9 +220,9 @@
195220
<ClInclude Include="include\vapoursynth.hpp" />
196221
</ItemGroup>
197222
<ItemGroup>
198-
<QtUic Include="src\ui\encodegui.ui" />
199-
<QtUic Include="src\ui\preview.ui" />
200-
<QtUic Include="src\ui\updater.ui" />
223+
<QtUic Include="include\windows\encodegui.ui" />
224+
<QtUic Include="include\windows\preview.ui" />
225+
<QtUic Include="include\windows\updater.ui" />
201226
</ItemGroup>
202227
<ItemGroup>
203228
<QtRcc Include="assets\EncodeGUI.qrc" />

‎EncodeGUI.vcxproj.filters

+15-12
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,12 @@
155155
<ClCompile Include="src\args\hdr.cpp">
156156
<Filter>Source Files</Filter>
157157
</ClCompile>
158-
<ClCompile Include="src\args\io.cpp">
159-
<Filter>Source Files</Filter>
160-
</ClCompile>
161158
<ClCompile Include="src\args\map.cpp">
162159
<Filter>Source Files</Filter>
163160
</ClCompile>
164161
<ClCompile Include="src\args\misc.cpp">
165162
<Filter>Source Files</Filter>
166163
</ClCompile>
167-
<ClCompile Include="src\args\mix.cpp">
168-
<Filter>Source Files</Filter>
169-
</ClCompile>
170164
<ClCompile Include="src\args\pass.cpp">
171165
<Filter>Source Files</Filter>
172166
</ClCompile>
@@ -200,6 +194,15 @@
200194
<ClCompile Include="src\args\vspipe.cpp">
201195
<Filter>Source Files</Filter>
202196
</ClCompile>
197+
<ClCompile Include="src\args\bitrate.cpp">
198+
<Filter>Source Files</Filter>
199+
</ClCompile>
200+
<ClCompile Include="src\args\chapters.cpp">
201+
<Filter>Source Files</Filter>
202+
</ClCompile>
203+
<ClCompile Include="src\ui\enviornment.cpp">
204+
<Filter>Source Files</Filter>
205+
</ClCompile>
203206
</ItemGroup>
204207
<ItemGroup>
205208
<ClInclude Include="include\vapoursynth.hpp">
@@ -253,13 +256,13 @@
253256
<ClInclude Include="include\args.hpp">
254257
<Filter>Header Files</Filter>
255258
</ClInclude>
256-
<ClInclude Include="x64\Release\uic\ui_EncodeGUI.h">
259+
<ClInclude Include="include\windows\ui_encodegui.hpp">
257260
<Filter>Header Files</Filter>
258261
</ClInclude>
259-
<ClInclude Include="x64\Release\uic\ui_Preview.h">
262+
<ClInclude Include="include\windows\ui_preview.hpp">
260263
<Filter>Header Files</Filter>
261264
</ClInclude>
262-
<ClInclude Include="x64\Release\uic\ui_Updater.h">
265+
<ClInclude Include="include\windows\ui_updater.hpp">
263266
<Filter>Header Files</Filter>
264267
</ClInclude>
265268
</ItemGroup>
@@ -272,13 +275,13 @@
272275
</QtMoc>
273276
</ItemGroup>
274277
<ItemGroup>
275-
<QtUic Include="src\ui\encodegui.ui">
278+
<QtUic Include="include\windows\encodegui.ui">
276279
<Filter>Form Files</Filter>
277280
</QtUic>
278-
<QtUic Include="src\ui\preview.ui">
281+
<QtUic Include="include\windows\preview.ui">
279282
<Filter>Form Files</Filter>
280283
</QtUic>
281-
<QtUic Include="src\ui\updater.ui">
284+
<QtUic Include="include\windows\updater.ui">
282285
<Filter>Form Files</Filter>
283286
</QtUic>
284287
</ItemGroup>

‎EncodeGUI.vcxproj.user

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
</SourceMap>
1111
</PropertyGroup>
1212
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release_linux|x64'">
13-
<QtLastBackgroundBuild>2023-02-26T09:19:01.2158288Z</QtLastBackgroundBuild>
13+
<QtLastBackgroundBuild>2023-05-06T21:16:29.8492274Z</QtLastBackgroundBuild>
1414
</PropertyGroup>
1515
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16-
<QtLastBackgroundBuild>2023-02-26T09:19:01.2554091Z</QtLastBackgroundBuild>
16+
<QtLastBackgroundBuild>2023-05-06T21:16:29.9331130Z</QtLastBackgroundBuild>
17+
</PropertyGroup>
18+
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
19+
<QtLastBackgroundBuild>2023-05-06T21:16:29.8911192Z</QtLastBackgroundBuild>
1720
</PropertyGroup>
1821
</Project>

0 commit comments

Comments
 (0)