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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/xauth/makefile | 6 | ||||
| -rw-r--r-- | apps/xcalc/makefile | 6 | ||||
| -rw-r--r-- | apps/xclock/makefile | 10 | ||||
| -rw-r--r-- | apps/xhost/makefile | 6 | ||||
| -rw-r--r-- | apps/xwininfo/makefile | 6 |
5 files changed, 5 insertions, 29 deletions
diff --git a/apps/xauth/makefile b/apps/xauth/makefile index 2e6125ac5..d14cf9e35 100644 --- a/apps/xauth/makefile +++ b/apps/xauth/makefile @@ -12,11 +12,7 @@ LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib -else -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib -endif +LINKLIBS += $(PTHREADLIB) CSRCS = \ gethost.c \ diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile index 28b93be60..4d20e4d82 100644 --- a/apps/xcalc/makefile +++ b/apps/xcalc/makefile @@ -16,11 +16,7 @@ LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib -else -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib -endif +LINKLIBS += $(PTHREADLIB) CSRCS = \ actions.c \ diff --git a/apps/xclock/makefile b/apps/xclock/makefile index d1ec788c6..42231508e 100644 --- a/apps/xclock/makefile +++ b/apps/xclock/makefile @@ -23,15 +23,7 @@ LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib \ - $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib -else -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \ - $(MHMAKECONF)\freetype\lib\freetype2501MT.lib -endif - -LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib +LINKLIBS += $(PTHREADLIB) $(FREETYPELIB) $(LIBXMLLIB) CSRCS = \ Clock.c \ diff --git a/apps/xhost/makefile b/apps/xhost/makefile index 44579d289..328fe8ccf 100644 --- a/apps/xhost/makefile +++ b/apps/xhost/makefile @@ -13,10 +13,6 @@ LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib -else -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib -endif +LINKLIBS += $(PTHREADLIB) CSRCS = xhost.c diff --git a/apps/xwininfo/makefile b/apps/xwininfo/makefile index d7693cd1f..cacef1297 100644 --- a/apps/xwininfo/makefile +++ b/apps/xwininfo/makefile @@ -10,11 +10,7 @@ LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) -ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib -else -LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib -endif +LINKLIBS += $(PTHREADLIB) CSRCS = \ clientwin.c \ |