diff options
| author | Louie S <louie@example.com> | 2023-05-09 17:20:31 -0700 |
|---|---|---|
| committer | Louie S <louie@example.com> | 2023-05-09 17:20:31 -0700 |
| commit | 14a6e82cc82e8c1802c0d468c6b32553d56099a6 (patch) | |
| tree | fd5e3efa83476f5b77b0928eafb0573135a9dd2d | |
| parent | 85398018f86932363623387b5a0417bf63db2db9 (diff) | |
Don't check for windres on unix builds
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/windows/.deps/terminal_media_launcher-cache.Po | 1 | ||||
| -rw-r--r-- | src/windows/.deps/terminal_media_launcher-draw.Po | 1 | ||||
| -rw-r--r-- | src/windows/.deps/terminal_media_launcher-read_cfg.Po | 1 |
5 files changed, 18 insertions, 7 deletions
@@ -5755,7 +5755,8 @@ if test "${enable_embed_icon+set}" = set; then : fi if test "x$embed_icon" = "xyes"; then - if test -n "$ac_tool_prefix"; then + if test "x$build_windows" = "xyes"; then + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5847,11 +5848,14 @@ else WINDRES="$ac_cv_prog_WINDRES" fi - if ${WINDRES:+false} :; then : + if ${WINDRES:+false} :; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot embed icon" >&5 $as_echo "$as_me: WARNING: Cannot embed icon" >&2;} - embed_icon=no + embed_icon=no fi + else + embed_icon=no + fi fi if test "$embed_icon" = "yes"; then EMBED_ICON_TRUE= diff --git a/configure.ac b/configure.ac index 78ee96c..bb8e8e8 100644 --- a/configure.ac +++ b/configure.ac @@ -59,10 +59,14 @@ AC_ARG_ENABLE([embed_icon], [embed icon in windows executable (default is yes)])], [embed_icon=no]) if test "x$embed_icon" = "xyes"; then - AC_CHECK_TOOL([WINDRES], [windres]) - AS_VAR_IF([WINDRES], [], - [AC_MSG_WARN([Cannot embed icon]) - embed_icon=no]) + if test "x$build_windows" = "xyes"; then + AC_CHECK_TOOL([WINDRES], [windres]) + AS_VAR_IF([WINDRES], [], + [AC_MSG_WARN([Cannot embed icon]) + embed_icon=no]) + else + embed_icon=no + fi fi AM_CONDITIONAL([EMBED_ICON], [test "$embed_icon" = "yes"]) diff --git a/src/windows/.deps/terminal_media_launcher-cache.Po b/src/windows/.deps/terminal_media_launcher-cache.Po new file mode 100644 index 0000000..9ce06a8 --- /dev/null +++ b/src/windows/.deps/terminal_media_launcher-cache.Po @@ -0,0 +1 @@ +# dummy diff --git a/src/windows/.deps/terminal_media_launcher-draw.Po b/src/windows/.deps/terminal_media_launcher-draw.Po new file mode 100644 index 0000000..9ce06a8 --- /dev/null +++ b/src/windows/.deps/terminal_media_launcher-draw.Po @@ -0,0 +1 @@ +# dummy diff --git a/src/windows/.deps/terminal_media_launcher-read_cfg.Po b/src/windows/.deps/terminal_media_launcher-read_cfg.Po new file mode 100644 index 0000000..9ce06a8 --- /dev/null +++ b/src/windows/.deps/terminal_media_launcher-read_cfg.Po @@ -0,0 +1 @@ +# dummy |