configure.ac
changeset 13657 3c2eaf481522
parent 13655 99fb2d227d8a
child 13684 aecf8c5a136a
     1.1 --- a/configure.ac	Fri Mar 20 19:51:54 2020 -0700
     1.2 +++ b/configure.ac	Fri Mar 20 20:33:26 2020 -0700
     1.3 @@ -34,6 +34,7 @@
     1.4  
     1.5  # libtool versioning
     1.6  LT_INIT([win32-dll])
     1.7 +LT_LANG([Windows Resource])
     1.8  
     1.9  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
    1.10  LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
    1.11 @@ -55,7 +56,7 @@
    1.12  AC_PROG_CXX
    1.13  AC_PROG_INSTALL
    1.14  AC_PROG_MAKE_SET
    1.15 -AC_CHECK_TOOL(WINDRES, [windres], [:])
    1.16 +AC_LIBTOOL_RC
    1.17  PKG_PROG_PKG_CONFIG
    1.18  
    1.19  dnl Make sure that srcdir is a full pathname
    1.20 @@ -4217,10 +4218,10 @@
    1.21  
    1.22  VERSION_OBJECTS=`echo $VERSION_SOURCES`
    1.23  VERSION_DEPENDS=`echo $VERSION_SOURCES`
    1.24 -VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
    1.25 +VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
    1.26  VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
    1.27 -\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\
    1.28 -	\\$(WINDRES) \\$< \\$@,g"`
    1.29 +\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created\\\\
    1.30 +	\\$(RUN_CMD_RC)\\$(LIBTOOL) --mode=compile --tag=RC \\$(RC) -i \\$< -o \\$@,g"`
    1.31  
    1.32  SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
    1.33  SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
    1.34 @@ -4301,7 +4302,6 @@
    1.35  AC_SUBST(EXTRA_CFLAGS)
    1.36  AC_SUBST(BUILD_LDFLAGS)
    1.37  AC_SUBST(EXTRA_LDFLAGS)
    1.38 -AC_SUBST(WINDRES)
    1.39  AC_SUBST(WAYLAND_SCANNER)
    1.40  
    1.41  cat >Makefile.rules <<__EOF__