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/xauth/makefile | 10 +--------- apps/xcalc/makefile | 12 ++---------- apps/xclock/makefile | 13 ++----------- apps/xhost/makefile | 10 +--------- apps/xwininfo/makefile | 11 +---------- 5 files changed, 7 insertions(+), 49 deletions(-) (limited to 'apps') diff --git a/apps/xauth/makefile b/apps/xauth/makefile index 235a5d46e..fbe2337c0 100644 --- a/apps/xauth/makefile +++ b/apps/xauth/makefile @@ -2,19 +2,11 @@ TTYAPP = xauth INCLUDELIBFILES = \ ..\common\$(OBJDIR)\common.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.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)\libxau\$(OBJDIR)\libXau.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib LIBDIRS=$(dir $(INCLUDELIBFILES)) 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);) diff --git a/apps/xclock/makefile b/apps/xclock/makefile index 99a8c4c81..2f0381b6a 100644 --- a/apps/xclock/makefile +++ b/apps/xclock/makefile @@ -3,15 +3,6 @@ WINAPP = xclock DEFINES += XT_NO_SM XRENDER 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)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib \ $(MHMAKECONF)\libXpm\src\$(OBJDIR)\libXpm.lib \ @@ -20,12 +11,12 @@ 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 \ $(MHMAKECONF)\libXft\src\$(OBJDIR)\libXft.lib \ $(MHMAKECONF)\libXrender\src\$(OBJDIR)\libXrender.lib \ $(MHMAKECONF)\fontconfig\src\$(OBJDIR)\libfontconfig.lib \ $(MHMAKECONF)\libXfont\src\util\$(OBJDIR)\libutil.lib - + INCLUDES += $(MHMAKECONF)\libXft\include $(MHMAKECONF)\freetype\include $(MHMAKECONF)\fontconfig LIBDIRS=$(dir $(INCLUDELIBFILES)) diff --git a/apps/xhost/makefile b/apps/xhost/makefile index 2461a488d..023fdc01b 100644 --- a/apps/xhost/makefile +++ b/apps/xhost/makefile @@ -4,18 +4,10 @@ TTYAPP = xhost INCLUDELIBFILES = \ ..\common\$(OBJDIR)\common.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.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)\libxau\$(OBJDIR)\libXau.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ LIBDIRS=$(dir $(INCLUDELIBFILES)) diff --git a/apps/xwininfo/makefile b/apps/xwininfo/makefile index 81c1eaf54..91770da3a 100644 --- a/apps/xwininfo/makefile +++ b/apps/xwininfo/makefile @@ -1,19 +1,10 @@ TTYAPP = xwininfo 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)\libxau\$(OBJDIR)\libXau.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib LIBDIRS=$(dir $(INCLUDELIBFILES)) -- cgit v1.2.3