diff --git a/darwin/LitoMusic/LitoMusic.xcodeproj/project.pbxproj b/darwin/LitoMusic/LitoMusic.xcodeproj/project.pbxproj index ea92c89..2e3d84b 100644 --- a/darwin/LitoMusic/LitoMusic.xcodeproj/project.pbxproj +++ b/darwin/LitoMusic/LitoMusic.xcodeproj/project.pbxproj @@ -34,7 +34,7 @@ B71F1E9B26FE141C00A9DAA2 /* WDBSetWebSecurityEnabled.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WDBSetWebSecurityEnabled.m; sourceTree = ""; }; B71F1E9F26FE2DE600A9DAA2 /* VisualEffectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualEffectView.swift; sourceTree = ""; }; B71F1EA326FEFE7C00A9DAA2 /* LitoSchemeHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LitoSchemeHandler.swift; sourceTree = ""; }; - B71F1EA826FF1F9F00A9DAA2 /* dist */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dist; path = ../../dist; sourceTree = ""; }; + B71F1EA826FF1F9F00A9DAA2 /* dist */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dist; path = ../../packages/lito/dist; sourceTree = ""; }; B7A197AD26FF34930066BCDC /* WKWebView+Hook.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+Hook.m"; sourceTree = ""; }; B7A197BD2700157A0066BCDC /* ParsedArgs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParsedArgs.swift; sourceTree = ""; }; /* End PBXFileReference section */ diff --git a/package.json b/package.json index 18338c7..01db387 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "install": "cd packages/lito && npm install", "dev:web": "cd packages/lito && npm start", "dev:windows": "cd windows && cargo run", - "build:web": "rm -rf dist && cd packages/lito && npm run build && mv dist ../..", + "build:web": "cd packages/lito && npm run build", "build:windows": "npm run build:web && cd windows && cargo build --target x86_64-pc-windows-msvc --release", "build:darwin": "npm run build:web && make -C darwin" } diff --git a/windows/build.rs b/windows/build.rs index f74b4a7..10b83b2 100644 --- a/windows/build.rs +++ b/windows/build.rs @@ -2,4 +2,5 @@ extern crate embed_resource; fn main() { embed_resource::compile("lito-manifest.rc"); + embed_resource::compile("version.rc"); } diff --git a/windows/lito-manifest.rc b/windows/lito-manifest.rc index dd144d3..b1cfc26 100644 --- a/windows/lito-manifest.rc +++ b/windows/lito-manifest.rc @@ -1,35 +1,4 @@ -#define VER 0,1,0,0 -#define VER_STR "0.1.0.0-beta.7\0" - #define RT_MANIFEST 24 1 RT_MANIFEST "lito.exe.manifest" IDI_APPLICATION ICON "icon.ico" - -2 VERSIONINFO - -FILEVERSION VER -PRODUCTVERSION VER - -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "FileDescription", "A lightweight Apple Music client." - VALUE "FileVersion", VER_STR - VALUE "InternalName", "Lito Music" - VALUE "LegalCopyright", "See LICENSE.txt in the repository." - VALUE "ProductName", "Lito Music" - VALUE "OriginalFilename", "lito.exe" - VALUE "ProductVersion", VER_STR - VALUE "ProductShortName", "Lito Music" - VALUE "Official Build", "0" - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1200, 0x0804, 1200 - END -END diff --git a/windows/src/main.rs b/windows/src/main.rs index 847ca6a..164a02d 100644 --- a/windows/src/main.rs +++ b/windows/src/main.rs @@ -38,7 +38,7 @@ const APP_URL: &str = if DEBUG { }; #[cfg(not(debug_assertions))] -static APP_DIR: Dir = include_dir!("..\\dist"); +static APP_DIR: Dir = include_dir!("..\\packages\\lito\\dist"); fn main() -> Result<()> { check_webview_installation()?; diff --git a/windows/version.rc b/windows/version.rc new file mode 100644 index 0000000..76ac2bf --- /dev/null +++ b/windows/version.rc @@ -0,0 +1,30 @@ +#define VER 0,1,0,0 +#define VER_STR "0.1.0.0-beta.7\0" + +1 VERSIONINFO + +FILEVERSION VER +PRODUCTVERSION VER + +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "FileDescription", "A lightweight Apple Music client." + VALUE "FileVersion", VER_STR + VALUE "InternalName", "Lito Music" + VALUE "LegalCopyright", "See LICENSE in the repository." + VALUE "ProductName", "Lito Music" + VALUE "OriginalFilename", "lito.exe" + VALUE "ProductVersion", VER_STR + VALUE "ProductShortName", "Lito Music" + VALUE "Official Build", "0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1200, 0x0804, 1200 + END +END