From 8fd115adc568833cdb5af22b65a09c38e0eac20f Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 26 Jun 2012 08:56:57 +0200 Subject: libX11 is now compiled as dll --- apps/xcalc/makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'apps/xcalc/makefile') diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile index 27e159173..a4deb34cc 100644 --- a/apps/xcalc/makefile +++ b/apps/xcalc/makefile @@ -3,15 +3,6 @@ WINAPP = xcalc DEFINES += XT_NO_SM IEEE INCLUDELIBFILES = \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libXpm\src\$(OBJDIR)\libXpm.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \ @@ -19,7 +10,8 @@ INCLUDELIBFILES = \ $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib + LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -- cgit v1.2.3