diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
| commit | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (patch) | |
| tree | eec421a528cb2f0fdaff43d4cf82fc0af89c0392 /xorg-server/makefile | |
| parent | 2553bdd7c359cd87525d367761c86932cec5adff (diff) | |
| download | vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.gz vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.bz2 vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.zip | |
vcxsrv compiles now. Still run-time errors.
Diffstat (limited to 'xorg-server/makefile')
| -rw-r--r-- | xorg-server/makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile index d1c758e09..110645fe2 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -2,9 +2,7 @@ ifneq ($(MAKESERVER),1) $(error Please specify MAKESERVER=1 on the command line or as environment variable) endif -INCLUDELIBFILES = afb\$(OBJDIR)\libafb.lib \ - cfb\$(OBJDIR)\libcfb.lib \ - cfb32\$(OBJDIR)\libcfb32.lib \ +INCLUDELIBFILES = \ composite\$(OBJDIR)\libcomposite.lib \ config\$(OBJDIR)\libconfig.lib \ damageext\$(OBJDIR)\libdamageext.lib \ @@ -16,7 +14,6 @@ INCLUDELIBFILES = afb\$(OBJDIR)\libafb.lib \ hw\kdrive\ephyr\$(OBJDIR)\libxephyr.lib \ hw\kdrive\src\$(OBJDIR)\libkdrive.lib \ hw\xwin\$(OBJDIR)\libxwin.lib \ - mfb\$(OBJDIR)\libmfb.lib \ mi\$(OBJDIR)\libmi.lib \ miext\damage\$(OBJDIR)\libdamage.lib \ miext\shadow\$(OBJDIR)\libshadow.lib \ @@ -60,13 +57,13 @@ OBJS = dix\$(OBJDIR)\main.obj WINAPP=vcxsrv -LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib - ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \ + $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \ +LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \ + $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif |