diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am (renamed from icon/Makefile.am) | 0 | ||||
| -rw-r--r-- | data/Makefile.in (renamed from icon/Makefile.in) | 6 | ||||
| -rw-r--r-- | data/icon.dia (renamed from icon/icon.dia) | bin | 1037 -> 1037 bytes | |||
| -rw-r--r-- | data/icon.ico (renamed from icon/icon.ico) | bin | 7058 -> 7058 bytes | |||
| -rw-r--r-- | data/icon.svg (renamed from icon/icon.svg) | 0 | ||||
| -rw-r--r-- | docs/windows_compile_instructions.md | 2 |
10 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 73b03d1..e0d5f78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src docs icon +SUBDIRS = src docs data dist_man_MANS = man man1_MANS = man/terminal-media-launcher.1 man5_MANS = man/terminal-media-launcher-config.5 diff --git a/Makefile.in b/Makefile.in index e1f608e..c0ffd0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -334,7 +334,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = src docs icon +SUBDIRS = src docs data dist_man_MANS = man man1_MANS = man/terminal-media-launcher.1 man5_MANS = man/terminal-media-launcher-config.5 @@ -5789,7 +5789,7 @@ else fi -ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile icon/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile data/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6544,7 +6544,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "icon/Makefile") CONFIG_FILES="$CONFIG_FILES icon/Makefile" ;; + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 6f85777..73bc282 100644 --- a/configure.ac +++ b/configure.ac @@ -49,5 +49,5 @@ AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"]) AC_CONFIG_FILES([Makefile src/Makefile docs/Makefile - icon/Makefile]) + data/Makefile]) AC_OUTPUT diff --git a/icon/Makefile.am b/data/Makefile.am index adb970f..adb970f 100644 --- a/icon/Makefile.am +++ b/data/Makefile.am diff --git a/icon/Makefile.in b/data/Makefile.in index b41de3f..9b34865 100644 --- a/icon/Makefile.in +++ b/data/Makefile.in @@ -87,7 +87,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = icon +subdir = data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -232,9 +232,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icon/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign icon/Makefile + $(AUTOMAKE) --foreign data/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/icon/icon.dia b/data/icon.dia Binary files differindex 549f8d2..549f8d2 100644 --- a/icon/icon.dia +++ b/data/icon.dia diff --git a/icon/icon.ico b/data/icon.ico Binary files differindex 1800a39..1800a39 100644 --- a/icon/icon.ico +++ b/data/icon.ico diff --git a/icon/icon.svg b/data/icon.svg index 683c67a..683c67a 100644 --- a/icon/icon.svg +++ b/data/icon.svg diff --git a/docs/windows_compile_instructions.md b/docs/windows_compile_instructions.md index 4421553..baaf524 100644 --- a/docs/windows_compile_instructions.md +++ b/docs/windows_compile_instructions.md @@ -17,7 +17,7 @@ $ pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-ncurses make 5. (optional) An icon can be embedded into the executable built at `src/terminal-media-launcher.exe` using the [rcedit](https://github.com/electron/rcedit) tool: ``` -$ rcedit.exe "src/terminal-media-launcher.exe" --set-icon "icon/icon.ico" +$ rcedit.exe "src/terminal-media-launcher.exe" --set-icon "data/icon.ico" ``` Open File Explorer in the current directory (can be done by running `explorer .` in MSYS2 terminal) and double click the generated executable in `src/` to run the program. If your MSYS2 `/bin` is set in your system PATH (see below), then you can also follow the Unix installation instructions to install `terminal-media-launcher` on your Windows system. |
