Skip to content

Commit

Permalink
src v1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
rocksdanister committed Jan 11, 2021
1 parent eb2f7f0 commit 1330699
Show file tree
Hide file tree
Showing 12 changed files with 167 additions and 137 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ Help translate lively to other languages: <a href="https://github.com/rocksdanis

**_I'm not officially affiliated with Unity technologies, godot, shadertoy;_**
## Download
##### Latest version: v1.1.7.0 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.1.7.0)
##### Latest version: v1.1.8.0 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.1.8.0)
- [`Installer`][direct-full-win32]

[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.1.7.0/lively_setup_x86_full_v1170.exe
[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.1.8.0/lively_setup_x86_full_v1180.exe

**Installer will give Smartscreen warning, [discussion.](https://github.com/rocksdanister/lively/issues/9)**

Expand Down
3 changes: 2 additions & 1 deletion src/installer/Script.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; https://jrsoftware.org/isinfo.php

#define MyAppName "Lively Wallpaper"
#define MyAppVersion "1.1.6.0"
#define MyAppVersion "1.1.8.0"
#define MyAppPublisher "rocksdanister"
#define MyAppURL "https://github.com/rocksdanister/lively"
#define MyAppExeName "livelywpf.exe"
Expand Down Expand Up @@ -108,6 +108,7 @@ type
{ Visual C++ 2019 v14, the included installer is a bundle consisting of older vers }
VC_2019_REDIST_X86_MIN = '{2E72FA1F-BADB-4337-B8AE-F7C17EC57D1D}';
VC_2019_REDIST_X86_142829515_MIN = '{CAA58D4B-E030-422E-8012-904C3371E68F}';
function MsiQueryProductState(szProduct: string): INSTALLSTATE;
external 'MsiQueryProductState{#AW}@msi.dll stdcall';
Expand Down
9 changes: 9 additions & 0 deletions src/livelywpf/libMPVPlayer/libMPVPlayer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,25 @@
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Mpv.NET" Version="1.1.1" />
Expand Down
9 changes: 9 additions & 0 deletions src/livelywpf/libVLCPlayer/libVLCPlayer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,25 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LibVLCSharp.WPF" Version="3.4.9" />
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.11" />
Expand Down
9 changes: 9 additions & 0 deletions src/livelywpf/livelySubProcess/livelySubProcess.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,23 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

</Project>
26 changes: 13 additions & 13 deletions src/livelywpf/livelywpf.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "livelySubProcess", "livelyS
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libVLCPlayer", "libVLCPlayer\libVLCPlayer.csproj", "{098B8B68-4808-4EB0-885F-DC91660EF56C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libMPVPlayer", "libMPVPlayer\libMPVPlayer.csproj", "{AB359D38-B323-42CF-84BB-88884E020BD9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libMPVPlayer", "libMPVPlayer\libMPVPlayer.csproj", "{AB359D38-B323-42CF-84BB-88884E020BD9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -171,8 +171,8 @@ Global
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|ARM64.Build.0 = Debug|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|x64.ActiveCfg = Debug|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|x64.Build.0 = Debug|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|x86.ActiveCfg = Debug|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|x86.Build.0 = Debug|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|x86.ActiveCfg = Debug|x86
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Debug|x86.Build.0 = Debug|x86
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|Any CPU.Build.0 = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|ARM.ActiveCfg = Release|Any CPU
Expand All @@ -181,8 +181,8 @@ Global
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|ARM64.Build.0 = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|x64.ActiveCfg = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|x64.Build.0 = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|x86.ActiveCfg = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|x86.Build.0 = Release|Any CPU
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|x86.ActiveCfg = Release|x86
{464000EF-544A-413A-AE74-69A15D5F3D1D}.Release|x86.Build.0 = Release|x86
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -191,8 +191,8 @@ Global
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|ARM64.Build.0 = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|x64.ActiveCfg = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|x64.Build.0 = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|x86.ActiveCfg = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|x86.Build.0 = Debug|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|x86.ActiveCfg = Debug|x86
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Debug|x86.Build.0 = Debug|x86
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|Any CPU.Build.0 = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|ARM.ActiveCfg = Release|Any CPU
Expand All @@ -201,8 +201,8 @@ Global
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|ARM64.Build.0 = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|x64.ActiveCfg = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|x64.Build.0 = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|x86.ActiveCfg = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|x86.Build.0 = Release|Any CPU
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|x86.ActiveCfg = Release|x86
{098B8B68-4808-4EB0-885F-DC91660EF56C}.Release|x86.Build.0 = Release|x86
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -211,8 +211,8 @@ Global
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|ARM64.Build.0 = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|x64.ActiveCfg = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|x64.Build.0 = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|x86.ActiveCfg = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|x86.Build.0 = Debug|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|x86.ActiveCfg = Debug|x86
{AB359D38-B323-42CF-84BB-88884E020BD9}.Debug|x86.Build.0 = Debug|x86
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|Any CPU.Build.0 = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|ARM.ActiveCfg = Release|Any CPU
Expand All @@ -221,8 +221,8 @@ Global
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|ARM64.Build.0 = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|x64.ActiveCfg = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|x64.Build.0 = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|x86.ActiveCfg = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|x86.Build.0 = Release|Any CPU
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|x86.ActiveCfg = Release|x86
{AB359D38-B323-42CF-84BB-88884E020BD9}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit 1330699

Please sign in to comment.