Skip to content

Commit 9d6fdd0

Browse files
Add wlua to Windows launcher
1 parent 2edcabc commit 9d6fdd0

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ dist-copy-windows:
5555
-cp -u $(LUACLIBS)/winapi.$(SO) $(FCUT_DIST)/bin/
5656
-cp -u $(LUACLIBS)/win32.$(SO) $(FCUT_DIST)/bin/
5757
cp -u $(LUACLIBS)/lua*.$(SO) $(FCUT_DIST)/bin/
58+
-cp -u $(LUACLIBS)/wlua$(EXE) $(FCUT_DIST)/bin/
5859
cp -u $(LUACLIBS)/WebView2Loader.dll $(FCUT_DIST)/bin/
5960
cp -u fcut.bat $(FCUT_DIST)/
6061

fcut.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ SETLOCAL
44
set LUA_PATH=lua\?.lua
55
set LUA_CPATH=bin\?.dll
66
set WEBVIEW_WIN32_ICON=htdocs\favicon.ico
7-
bin\lua fcut.lua -ffmpeg ffmpeg\ffmpeg.exe %*
7+
start "FCut" /B bin\wlua.exe fcut.lua %*
88

99
ENDLOCAL

htdocs/fcut.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,15 @@ <h2>Export</h2>
240240
<h2>Missing Configuration</h2>
241241
<p>It seems that some configuration is missing or invalid.</p>
242242
<p>Check that you provided the correct location for ffmpeg and ffprobe.</p>
243-
<p>You could download FFmpeg binaries on the <a href="https://www.ffmpeg.org/download.html" target="_blank">FFmpeg site</a>.</li>
243+
<p>You could download FFmpeg binaries on the <a href="https://www.ffmpeg.org/download.html" target="_blank">FFmpeg site</a>
244+
or on the <a href="https://github.com/javalikescript/fcut/releases/download/v0.3.0/ffmpeg-x86_64-windows.zip" target="_blank">FCut github</a>.</li>
244245
</div>
245246
</page>
246247
<page name="about">
247248
<div class="padded">
248249
<button v-on:click="pages.navigateBack()"><i class="fas fa-arrow-left"></i></button>
249250
<h2>About</h2>
251+
<p>A <a href="https://github.com/javalikescript/luajls" target="_blank">luajls</a> application, see <a href="https://github.com/javalikescript/fcut" target="_blank">sources</a>.</p>
250252
<p>This application uses the following external software/libraries</p>
251253
<ul>
252254
<li><a href="https://www.lua.org/home.html" target="_blank">Lua</a> is licensed under the MIT license</li>

0 commit comments

Comments
 (0)