From de54c5b749b3eefb75d420840c889533a58aa342 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 24 Jul 2013 14:25:51 +0200 Subject: 64-bit compilation now compiles and runs --- xorg-server/hw/xwin/xlaunch/makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'xorg-server/hw/xwin/xlaunch/makefile') diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile index 98656e57e..83426fe19 100644 --- a/xorg-server/hw/xwin/xlaunch/makefile +++ b/xorg-server/hw/xwin/xlaunch/makefile @@ -11,18 +11,12 @@ WINAPP = xlaunch RESOURCES = resources.rc -$(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc) +$(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc) $(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $< LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib - -ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib -else -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib -endif +LINKLIBS += $(LIBXMLLIB) $(PTHREADLIB) -- cgit v1.2.3