aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xorg-server/makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 6b8ec305f..d5f9c5b6f 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -98,9 +98,12 @@ EXTRASTOBUILDDIRS=$(dir $(EXTRASTOBUILD))
load_makefile $(EXTRASTOBUILDDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
all: $(EXTRASTOBUILD)
-BASEOBJDIR=$(NOSERVOBJDIR:obj\%=%)
load_makefile ..\mesalib\windows\VC8\mesa\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-all: ..\mesalib\windows\VC8\mesa\$(BASEOBJDIR)\swrast_dri.dll
+ifeq ($(DEBUG),1)
+all: ..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll
+else
+all: ..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll
+endif
all: fonts.src\all xkeyboard-config\all