aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/makefile')
-rw-r--r--xorg-server/makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 6cb0ee817..6e86820d0 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -43,16 +43,20 @@ INCLUDELIBFILES = \
$(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)\zlib\$(OBJDIR)\libz.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)\zlib\$(NOSERVOBJDIR)\zlib1.lib
+
LIBDIRS=$(dir $(INCLUDELIBFILES))
+NOSERVLIBDIRS=$(dir $(INCLUDENOSERVLIBFILES))
load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
+load_makefile $(NOSERVLIBDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
OBJS = dix\$(OBJDIR)\main.obj