From b287d7f6a13823ea17e0bd415981d3a5953ca703 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 22 Feb 2010 12:09:38 +0000 Subject: build system: various small fixes for mingw32 cross compilation still incomplete git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/am/texmf.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Build/source/texk/web2c/am') diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 999f5221a9d..1eda64046ea 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -104,6 +104,9 @@ mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib) windowlib = window/libwindow.a $(windowlib): mfd.h $(srcdir)/window/*.c cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a +if WIN32 +mf_x_libs = -lgdi32 +else !WIN32 # Make `#include ' and `-lX...' work. # This matches xdvik. # wlibs is substituted by web2c's configure, LIBS by general configure @@ -112,6 +115,7 @@ $(windowlib): mfd.h $(srcdir)/window/*.c # Follow the library order used in X11R6 itself: # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS) +endif !WIN32 ## mf and mf-nowin compile mfextra.c with different CPPFLAGS. ## Automake, however, does not support CPPFLAGS for individual source files. -- cgit v1.2.3