Browse Source

Ensure that WINDRES always has a value

pull/1131/head
Hamish Coleman 1 year ago
parent
commit
6d464f24a6
  1. 1
      Makefile
  2. 2
      configure.ac

1
Makefile

@ -45,7 +45,6 @@ export CONFIG_TARGET
ifndef CONFIG_TARGET ifndef CONFIG_TARGET
ifeq ($(shell uname -o),Msys) ifeq ($(shell uname -o),Msys)
CONFIG_TARGET=mingw CONFIG_TARGET=mingw
WINDRES=windres
else ifeq ($(shell uname -s),Darwin) else ifeq ($(shell uname -s),Darwin)
CONFIG_TARGET=darwin CONFIG_TARGET=darwin
else ifeq ($(shell uname), SunOS) else ifeq ($(shell uname), SunOS)

2
configure.ac

@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(scripts)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_PROG_CC AC_PROG_CC
AC_CHECK_TOOL([AR], [ar], [false]) AC_CHECK_TOOL([AR], [ar], [false])
AC_CHECK_TOOL([WINDRES], [windres], [false]) AC_CHECK_TOOL([WINDRES], [windres], [windres])
# TODO: ideally, should use AC_ARG_ENABLE # TODO: ideally, should use AC_ARG_ENABLE
AC_ARG_WITH([edgex], AC_ARG_WITH([edgex],

Loading…
Cancel
Save