aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-11-06 13:12:31 +0000
committermarha <marha@users.sourceforge.net>2009-11-06 13:12:31 +0000
commit685a5b0d13ec50e7340f293c519b540a7eefb885 (patch)
tree054243f5fde7814b42747cb2c5eeabf030ef0dba /xorg-server
parentdc973fac7166624dc3aca9b32df02cc00e79ba85 (diff)
parentf82153a9f5ada39e64bdfaca1c68f951d79d005c (diff)
downloadvcxsrv-685a5b0d13ec50e7340f293c519b540a7eefb885.tar.gz
vcxsrv-685a5b0d13ec50e7340f293c519b540a7eefb885.tar.bz2
vcxsrv-685a5b0d13ec50e7340f293c519b540a7eefb885.zip
Added xclock and xcalc.
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 49b80ba7b..896656c40 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -58,16 +58,22 @@ OBJS = dix\$(OBJDIR)\main.obj
ifeq ($(DEBUG),1)
TTYAPP=vcxsrv_dbg
+APP:=$(TTYAPP)
LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
$(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \
$(MHMAKECONF)\pthreads\pthreadVC2d.lib
+
+$(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
+
else
-TTYAPP=vcxsrv
+WINAPP=vcxsrv
+APP:=$(WINAPP)
LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
$(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
+
endif
RCINCLUDES += hw\xwin $(MHMAKECONF)\include $(MHMAKECONF)
@@ -77,7 +83,7 @@ XWin.rc: hw\xwin\XWin.rc
RESOURCES = XWin.rc
-$(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
+$(OBJDIR)\$(APP).exe: $(LINKLIBS)
XKeysymDB: ..\libX11\src\XKeysymDB
copy $< $@
@@ -85,7 +91,7 @@ XKeysymDB: ..\libX11\src\XKeysymDB
XErrorDB: ..\libX11\src\XErrorDB
copy $< $@
-$(TTYAPP).exe: $(OBJDIR)\$(TTYAPP).exe
+%.exe: $(OBJDIR)\%.exe
copy $< $@
load_makefile hw\xwin\xlaunch\makefile MAKESERVER=0 DEBUG=0
@@ -107,7 +113,7 @@ load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0
load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0
load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
-all: $(TTYAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \
+all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \
..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe \
opengl32.dll swrast_dri.dll