aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-15 06:15:22 +0000
committermarha <marha@users.sourceforge.net>2009-09-15 06:15:22 +0000
commit04744f33cf800cc355b9765d7ea543e8648e54fa (patch)
tree46477b96873c19e3b162bfa25b3afc0155e17258 /xorg-server
parent248700c18b5ec849231f8d0d464b2a021bfbaef8 (diff)
downloadvcxsrv-04744f33cf800cc355b9765d7ea543e8648e54fa.tar.gz
vcxsrv-04744f33cf800cc355b9765d7ea543e8648e54fa.tar.bz2
vcxsrv-04744f33cf800cc355b9765d7ea543e8648e54fa.zip
Renamed debug version to vcxsrv_dbg and also install together with the symbol file.
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/installer/vcxsrv.nsi2
-rw-r--r--xorg-server/makefile18
2 files changed, 12 insertions, 8 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index d21ea8801..162560b12 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -57,6 +57,8 @@ Section "VcXsrv (required)"
; Put files there
File "..\obj\servrelease\vcxsrv.exe"
+ File "..\obj\servdebug\vcxsrv_dbg.exe"
+ File "..\obj\servdebug\vcxsrv_dbg.pdb"
File "..\protocol.txt"
File "..\system.XWinrc"
File "..\..\xkbcomp\obj\release\xkbcomp.exe"
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 4eae8a365..800b5b5d5 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -55,13 +55,15 @@ load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(D
OBJS = dix\$(OBJDIR)\main.obj
-TTYAPP=vcxsrv
-
ifeq ($(DEBUG),1)
+TTYAPP=vcxsrv_dbg
+
LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
$(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \
$(MHMAKECONF)\pthreads\pthreadVC2d.lib
else
+TTYAPP=vcxsrv
+
LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
$(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
@@ -82,19 +84,19 @@ XKeysymDB: ..\libX11\src\XKeysymDB
$(TTYAPP).exe: $(OBJDIR)\$(TTYAPP).exe
copy $< $@
-load_makefile hw\xwin\xlaunch\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+load_makefile hw\xwin\xlaunch\makefile MAKESERVER=0 DEBUG=0
-xlaunch.exe: hw\xwin\xlaunch\$(OBJDIR:obj\$(OBJDIRPREFIX)%=obj\%)\xlaunch.exe
+xlaunch.exe: hw\xwin\xlaunch\obj\release\xlaunch.exe
copy $< $@
-load_makefile ..\xkbcomp\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+load_makefile ..\xkbcomp\makefile MAKESERVER=0 DEBUG=0
-xkbcomp.exe: ..\xkbcomp\$(OBJDIR:obj\$(OBJDIRPREFIX)%=obj\%)\xkbcomp.exe
+xkbcomp.exe: ..\xkbcomp\obj\release\xkbcomp.exe
copy $< $@
-load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0
-plink.exe: ..\tools\plink\$(OBJDIR:obj\$(OBJDIRPREFIX)%=obj\%)\plink.exe
+plink.exe: ..\tools\plink\obj\release\plink.exe
copy $< $@
load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0