configure: Add a .exe extension to the tools dependencies when building on Windows.
This commit is contained in:
parent
835928720b
commit
b860c4aab0
|
@ -32,6 +32,7 @@ EXEEXT = @EXEEXT@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
LIBEXT = @LIBEXT@
|
LIBEXT = @LIBEXT@
|
||||||
DLLEXT = @DLLEXT@
|
DLLEXT = @DLLEXT@
|
||||||
|
TOOLSEXT = @TOOLSEXT@
|
||||||
IMPLIBEXT = @IMPLIBEXT@
|
IMPLIBEXT = @IMPLIBEXT@
|
||||||
LDSHARED = @LDSHARED@
|
LDSHARED = @LDSHARED@
|
||||||
DLLTOOL = @DLLTOOL@
|
DLLTOOL = @DLLTOOL@
|
||||||
|
@ -65,16 +66,15 @@ WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
|
||||||
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
|
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
|
||||||
C2MAN = $(TOPSRCDIR)/tools/c2man.pl
|
C2MAN = $(TOPSRCDIR)/tools/c2man.pl
|
||||||
RUNTEST = $(TOPSRCDIR)/tools/runtest
|
RUNTEST = $(TOPSRCDIR)/tools/runtest
|
||||||
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild
|
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT)
|
||||||
MAKEDEP = $(TOOLSDIR)/tools/makedep
|
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
|
||||||
MAKECTESTS = $(TOOLSDIR)/tools/make_ctests
|
MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT)
|
||||||
WRC = $(TOOLSDIR)/tools/wrc/wrc
|
WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
|
||||||
WMC = $(TOOLSDIR)/tools/wmc/wmc
|
WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT)
|
||||||
WIDL = $(TOOLSDIR)/tools/widl/widl
|
WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT)
|
||||||
WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR)
|
WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR)
|
||||||
RELPATH = $(TOOLSDIR)/tools/relpath
|
RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT)
|
||||||
SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt
|
SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT)
|
||||||
FNT2FON = $(TOOLSDIR)/tools/fnt2fon
|
|
||||||
RC = $(WRC)
|
RC = $(WRC)
|
||||||
RC16 = $(WRC)
|
RC16 = $(WRC)
|
||||||
RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
|
RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
|
||||||
|
|
|
@ -119,7 +119,7 @@ RECURSE_TARGETS = \
|
||||||
depend $(RECURSE_TARGETS): $(MAKEDEP)
|
depend $(RECURSE_TARGETS): $(MAKEDEP)
|
||||||
|
|
||||||
$(MAKEDEP): include/config.h
|
$(MAKEDEP): include/config.h
|
||||||
@cd $(TOOLSDIR)/tools && $(MAKE) makedep
|
@cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT)
|
||||||
|
|
||||||
# Test rules
|
# Test rules
|
||||||
|
|
||||||
|
|
|
@ -612,6 +612,7 @@ EXTRA_BINARIES
|
||||||
MAIN_BINARY
|
MAIN_BINARY
|
||||||
SOCKETLIBS
|
SOCKETLIBS
|
||||||
CRTLIBS
|
CRTLIBS
|
||||||
|
TOOLSEXT
|
||||||
LDPATH
|
LDPATH
|
||||||
BUILTINFLAG
|
BUILTINFLAG
|
||||||
EXTRACFLAGS
|
EXTRACFLAGS
|
||||||
|
@ -11971,6 +11972,8 @@ LDPATH=""
|
||||||
|
|
||||||
case $build_os in
|
case $build_os in
|
||||||
cygwin*|mingw32*)
|
cygwin*|mingw32*)
|
||||||
|
TOOLSEXT=".exe"
|
||||||
|
|
||||||
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
|
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
|
||||||
;;
|
;;
|
||||||
darwin*|macosx*)
|
darwin*|macosx*)
|
||||||
|
|
|
@ -1593,6 +1593,7 @@ dnl **** Platform-specific checks ****
|
||||||
AC_SUBST(LDPATH,"")
|
AC_SUBST(LDPATH,"")
|
||||||
case $build_os in
|
case $build_os in
|
||||||
cygwin*|mingw32*)
|
cygwin*|mingw32*)
|
||||||
|
AC_SUBST(TOOLSEXT,".exe")
|
||||||
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
|
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
|
||||||
;;
|
;;
|
||||||
darwin*|macosx*)
|
darwin*|macosx*)
|
||||||
|
|
|
@ -182,6 +182,6 @@ clean::
|
||||||
$(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c
|
$(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c
|
||||||
|
|
||||||
$(RELPATH):
|
$(RELPATH):
|
||||||
@cd $(TOOLSDIR)/tools && $(MAKE) relpath
|
@cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
|
||||||
|
|
||||||
@DEPENDENCIES@ # everything below this line is overwritten by make depend
|
@DEPENDENCIES@ # everything below this line is overwritten by make depend
|
||||||
|
|
Loading…
Reference in New Issue