From e13052c62d5e480c3458c5a485ec6ca039d5607c Mon Sep 17 00:00:00 2001 From: javalikescript Date: Sun, 24 Mar 2024 17:54:16 +0100 Subject: [PATCH] Add license and cleanup --- Makefile | 7 +++++-- fcut.bat | 9 --------- fcut.sh | 2 -- 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 fcut.bat delete mode 100755 fcut.sh diff --git a/Makefile b/Makefile index d89c42a..731af2e 100644 --- a/Makefile +++ b/Makefile @@ -24,12 +24,12 @@ EXE := $(EXE_$(PLAT)) MAIN_MK := $(MK_$(PLAT)) ZIP := $(ZIP_$(PLAT)) -RELEASE_FILES ?= fcut$(EXE) README.md +RELEASE_FILES ?= fcut$(EXE) README.md licenses.txt STATIC_FLAGS_windows=lua/src/wlua.res -mwindows STATIC_FLAGS_linux= -release: bin release$(ZIP) +release: bin licenses release$(ZIP) release-full: $(MAKE) release RELEASE_FILES="$(RELEASE_FILES) ffmpeg" @@ -40,6 +40,9 @@ show: @echo RELEASE_DATE: $(RELEASE_DATE) @echo RELEASE_NAME: $(RELEASE_NAME) +licenses: + cp -u $(LUACLIBS)/licenses.txt . + bin: $(MAKE) -C $(LUACLIBS) OPENSSL_LIBNAMES= OPENSSL_LIBS= \ STATIC_RESOURCES="-R $(FCUT_REL)/assets $(FCUT_REL)/htdocs -l $(FCUT_REL)/fcut.lua $(FCUT_REL)/fcutSchema.lua $(FCUT_REL)/Ffmpeg.lua $(FCUT_REL)/FileChooser.lua" \ diff --git a/fcut.bat b/fcut.bat deleted file mode 100644 index fb5efa1..0000000 --- a/fcut.bat +++ /dev/null @@ -1,9 +0,0 @@ -@ECHO OFF -SETLOCAL - -set LUA_PATH=lua\?.lua -set LUA_CPATH=bin\?.dll -set WEBVIEW_WIN32_ICON=htdocs\favicon.ico -start "FCut" /B bin\wlua.exe fcut.lua %* - -ENDLOCAL diff --git a/fcut.sh b/fcut.sh deleted file mode 100755 index 282b9b7..0000000 --- a/fcut.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -LUA_PATH="lua/?.lua" LUA_CPATH="bin/?.so" bin/lua fcut.lua -ffmpeg /usr/bin/ffmpeg "$@"