diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-25 09:09:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-25 09:09:14 +0200 |
| commit | b1565e868d5549753fd710529b88bd4c183889ab (patch) | |
| tree | 1ec66b54444e5ad1a6c2836c648b3f1bf4c626d2 /makefile.after | |
| parent | 66841fa144ddd72df67ab1ddf880ca508d4bc9e3 (diff) | |
| download | vcxsrv-b1565e868d5549753fd710529b88bd4c183889ab.tar.gz vcxsrv-b1565e868d5549753fd710529b88bd4c183889ab.tar.bz2 vcxsrv-b1565e868d5549753fd710529b88bd4c183889ab.zip | |
zlib is now compiled as a dll
Diffstat (limited to 'makefile.after')
| -rw-r--r-- | makefile.after | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/makefile.after b/makefile.after index 5dd5e1cac..996fbb93f 100644 --- a/makefile.after +++ b/makefile.after @@ -62,11 +62,11 @@ endif all: $(EXE)
-$(EXE) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE) $(EXTRALIB)
+$(EXE) : $(OBJS) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(RESOBJS) $(MANIFESTFILE) $(EXTRALIB)
ifndef VS2008
- $(LINK) $(LINKFLAGS) /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
+ $(LINK) $(LINKFLAGS) /OUT:$(relpath $@) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
else
- $(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
+ $(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1
endif
@@ -118,6 +118,10 @@ ifdef INC_BDF_RULES load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+#bdftopcf is dependent on zlib1.dll, so we need to add the directory of the zlib dll to the path env variable
+PATH:=$(relpath $(MHMAKECONF)\zlib\$(NOSERVOBJDIR))\;$(PATH)
+export PATH
+
$(DESTDIR)\%.pcf.gz: %.bdf
@del -e $@
$(BDFTOPCF) -t $< | gzip > $@
|