aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-25 11:23:18 +0200
committermarha <marha@users.sourceforge.net>2012-06-25 11:55:38 +0200
commit9a867e32f89cdd115cdad9c25aeced6725886ee5 (patch)
tree0f0c25ff08e587a5b835349725cc0e58586e125d
parentb1565e868d5549753fd710529b88bd4c183889ab (diff)
downloadvcxsrv-9a867e32f89cdd115cdad9c25aeced6725886ee5.tar.gz
vcxsrv-9a867e32f89cdd115cdad9c25aeced6725886ee5.tar.bz2
vcxsrv-9a867e32f89cdd115cdad9c25aeced6725886ee5.zip
The following libraries have no xserver dependent compilation anymore
libX11 libxcb pixman libXdmcp libXau libXfont libXfont libXfont libXfont libXfont libXfont libXfont libfontenc libXinerama
-rw-r--r--makefile.after4
-rw-r--r--xorg-server/makefile46
-rw-r--r--xorg-server/xkeyboard-config/rules/makefile2
3 files changed, 26 insertions, 26 deletions
diff --git a/makefile.after b/makefile.after
index 996fbb93f..73f016cf9 100644
--- a/makefile.after
+++ b/makefile.after
@@ -39,8 +39,8 @@ ifeq (1,$(call OR, $(call NE,$(WINAPP)_,_) $(call NE,$(TTYAPP)_,_)))
ifdef WINAPP
-load_makefile $(MHMAKECONF)\libwinmain\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG)
-EXTRALIB := $(MHMAKECONF)\libwinmain\$(OBJDIR)\libwinmain.lib
+load_makefile $(MHMAKECONF)\libwinmain\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+EXTRALIB := $(MHMAKECONF)\libwinmain\$(NOSERVOBJDIR)\libwinmain.lib
EXE := $(WINAPP:%=$(OBJDIR)\%.exe)
LINKFLAGS += /SUBSYSTEM:WINDOWS
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 6e86820d0..2d3eac036 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -25,31 +25,31 @@ INCLUDELIBFILES = \
Xi\$(OBJDIR)\libXi.lib \
xkb\$(OBJDIR)\libxkb.lib \
render\$(OBJDIR)\librender.lib \
- $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
- $(MHMAKECONF)\libXdmcp\$(OBJDIR)\libXdmcp.lib \
- $(MHMAKECONF)\libXfont\src\util\$(OBJDIR)\libutil.lib \
- $(MHMAKECONF)\libXfont\src\fc\$(OBJDIR)\libfc.lib \
- $(MHMAKECONF)\libXfont\src\fontfile\$(OBJDIR)\libfontfile.lib \
- $(MHMAKECONF)\libXfont\src\builtins\$(OBJDIR)\libbuiltins.lib \
- $(MHMAKECONF)\libXfont\src\bitmap\$(OBJDIR)\libbitmap.lib \
- $(MHMAKECONF)\pixman\pixman\$(OBJDIR)\libpixman-1.lib \
- $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \
- $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
- $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \
- $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \
- $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
- $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \
- $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \
- $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \
- $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \
- $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \
- $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
- $(MHMAKECONF)\libfontenc\src\$(OBJDIR)\libfontenc.lib \
- $(MHMAKECONF)\libXfont\src\freetype\$(OBJDIR)\libft.lib \
- $(MHMAKECONF)\libXfont\src\stubs\$(OBJDIR)\libstubs.lib \
- $(MHMAKECONF)\libXinerama\src\$(OBJDIR)\libXinerama.lib
INCLUDENOSERVLIBFILES = \
+ $(MHMAKECONF)\libX11\modules\im\ximcp\$(NOSERVOBJDIR)\libximcp.lib \
+ $(MHMAKECONF)\libX11\src\xlibi18n\$(NOSERVOBJDIR)\libi18n.lib \
+ $(MHMAKECONF)\libX11\src\$(NOSERVOBJDIR)\libx11.lib \
+ $(MHMAKECONF)\libX11\src\xcms\$(NOSERVOBJDIR)\libxcms.lib \
+ $(MHMAKECONF)\libX11\src\xkb\$(NOSERVOBJDIR)\libxkb.lib \
+ $(MHMAKECONF)\libX11\modules\om\generic\$(NOSERVOBJDIR)\libxomGeneric.lib \
+ $(MHMAKECONF)\libX11\modules\lc\utf8\$(NOSERVOBJDIR)\libxlcUTF8Load.lib \
+ $(MHMAKECONF)\libX11\modules\lc\def\$(NOSERVOBJDIR)\libxlcDef.lib \
+ $(MHMAKECONF)\libX11\modules\lc\gen\$(NOSERVOBJDIR)\liblcGenConvLoad.lib \
+ $(MHMAKECONF)\libX11\modules\lc\xlocale\$(NOSERVOBJDIR)\libxlocale.lib \
+ $(MHMAKECONF)\libxcb\src\$(NOSERVOBJDIR)\libxcb.lib \
+ $(MHMAKECONF)\pixman\pixman\$(NOSERVOBJDIR)\libpixman-1.lib \
+ $(MHMAKECONF)\libXdmcp\$(NOSERVOBJDIR)\libXdmcp.lib \
+ $(MHMAKECONF)\libXau\$(NOSERVOBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXfont\src\util\$(NOSERVOBJDIR)\libutil.lib \
+ $(MHMAKECONF)\libXfont\src\fc\$(NOSERVOBJDIR)\libfc.lib \
+ $(MHMAKECONF)\libXfont\src\fontfile\$(NOSERVOBJDIR)\libfontfile.lib \
+ $(MHMAKECONF)\libXfont\src\builtins\$(NOSERVOBJDIR)\libbuiltins.lib \
+ $(MHMAKECONF)\libXfont\src\bitmap\$(NOSERVOBJDIR)\libbitmap.lib \
+ $(MHMAKECONF)\libXfont\src\freetype\$(NOSERVOBJDIR)\libft.lib \
+ $(MHMAKECONF)\libXfont\src\stubs\$(NOSERVOBJDIR)\libstubs.lib \
+ $(MHMAKECONF)\libfontenc\src\$(NOSERVOBJDIR)\libfontenc.lib \
+ $(MHMAKECONF)\libXinerama\src\$(NOSERVOBJDIR)\libXinerama.lib \
$(MHMAKECONF)\zlib\$(NOSERVOBJDIR)\zlib1.lib
LIBDIRS=$(dir $(INCLUDELIBFILES))
diff --git a/xorg-server/xkeyboard-config/rules/makefile b/xorg-server/xkeyboard-config/rules/makefile
index c8b2f25c2..4e2786734 100644
--- a/xorg-server/xkeyboard-config/rules/makefile
+++ b/xorg-server/xkeyboard-config/rules/makefile
@@ -2,7 +2,7 @@ ifeq ($(MAKESERVER),1)
$(error Please do not specify MAKESERVER=1)
endif
-load_makefile compat\makefile DEBUG=$(DEBUG)
+load_makefile compat\makefile MAKESERVER=0 DEBUG=$(DEBUG)
DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules