Reorganization of data resources

This commit is contained in:
redtide 2021-06-20 17:37:08 +02:00 committed by Francesco
parent 83a604dfb7
commit 3f58e554ba
12 changed files with 8 additions and 8 deletions

2
.gitattributes vendored
View File

@ -1,3 +1,3 @@
winlib/* linguist-vendored
src/lib/* linguist-vendored
icon.inl linguist-vendored
resources/icons/icon.inl linguist-vendored

View File

@ -84,7 +84,7 @@ lite_build_package_windows () {
rm -fr ".package-build"
echo "created package $package_name"
}
lite_build_package_macos () {
local build="$1"
local arch="$2"
@ -100,8 +100,8 @@ lite_build_package_macos () {
for module_name in plugins colors; do
cp -r "$build/third/data/$module_name" "$datadir"
done
cp dev-utils/icon.icns "$appdir/Contents/Resources/icon.icns"
cp dev-utils/Info.plist "$appdir/Contents/Info.plist"
cp resources/icons/icon.icns "$appdir/Contents/Resources/icon.icns"
cp resources/macos/Info.plist "$appdir/Contents/Info.plist"
cp "$build/src/lite" "$bindir/lite-xl"
strip "$bindir/lite-xl"
pushd ".package-build"
@ -142,8 +142,8 @@ lite_build_package_linux () {
strip "$bindir/lite"
if [ -z "$portable" ]; then
mkdir -p "$pdir/share/applications" "$pdir/share/icons/hicolor/scalable/apps"
cp "dev-utils/lite-xl.desktop" "$pdir/share/applications"
cp "dev-utils/lite.svg" "$pdir/share/icons/hicolor/scalable/apps/lite-xl.svg"
cp "resources/linux/lite-xl.desktop" "$pdir/share/applications"
cp "resources/icons/lite.svg" "$pdir/share/icons/hicolor/scalable/apps/lite-xl.svg"
fi
pushd ".package-build"
local package_name="lite-xl-$os-$arch$portable.tar.gz"

View File

@ -55,7 +55,7 @@ endif
lite_rc = []
if host_machine.system() == 'windows'
windows = import('windows')
lite_rc += windows.compile_resources('res.rc')
lite_rc += windows.compile_resources('resources/icons/icon.rc')
endif
# On macos we need to use the SDL renderer to support retina displays

View File

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -79,7 +79,7 @@ static void get_exe_filename(char *buf, int sz) {
static void init_window_icon(void) {
#ifndef _WIN32
#include "../icon.inl"
#include "../resources/icons/icon.inl"
(void) icon_rgba_len; /* unused */
SDL_Surface *surf = SDL_CreateRGBSurfaceFrom(
icon_rgba, 64, 64,