diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-24 14:25:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:25:18 +0200 |
| commit | de54c5b749b3eefb75d420840c889533a58aa342 (patch) | |
| tree | 6502771c9dd5a0d455388734060469b18f2e4011 /xorg-server/hw/xwin/xlaunch/makefile | |
| parent | 0606cba5be2dab08f0b4de540d7b278fa6273daf (diff) | |
| download | vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.gz vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.bz2 vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.zip | |
64-bit compilation now compiles and runs
Diffstat (limited to 'xorg-server/hw/xwin/xlaunch/makefile')
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/makefile | 10 |
1 files changed, 2 insertions, 8 deletions
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)
|