diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/xcalc/makefile | 36 | ||||
| -rw-r--r-- | apps/xclock/Clock.c | 3 | ||||
| -rw-r--r-- | apps/xclock/makefile | 38 | ||||
| -rw-r--r-- | apps/xwininfo/makefile | 28 | ||||
| -rw-r--r-- | apps/xwininfo/xwininfo.c | 7 |
5 files changed, 112 insertions, 0 deletions
diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile new file mode 100644 index 000000000..eab29a50f --- /dev/null +++ b/apps/xcalc/makefile @@ -0,0 +1,36 @@ +WINAPP = xcalc + +DEFINES += XT_NO_SM + +INCLUDELIBFILES = \ + $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \ + $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ + $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ + $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ + $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ + $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ + $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ + $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ + $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ + $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ + $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ + $(MHMAKECONF)\libxpm\src\$(OBJDIR)\libxpm.lib \ + $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \ + $(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \ + $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ + $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ + $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib +LIBDIRS=$(dir $(INCLUDELIBFILES)) + +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) + +ifeq ($(DEBUG),1) +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib +else +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib +endif + +CSRCS = \ + actions.c \ + math.c \ + xcalc.c diff --git a/apps/xclock/Clock.c b/apps/xclock/Clock.c index cbb0e4208..06361e780 100644 --- a/apps/xclock/Clock.c +++ b/apps/xclock/Clock.c @@ -96,6 +96,7 @@ SOFTWARE. #include <X11/Xosdefs.h> #include <stdio.h> #include <X11/Xos.h> +#include <X11\Xwinsock.h> #include <X11/Xaw/XawInit.h> #if !defined(NO_I18N) && defined(HAVE_ICONV) #include <iconv.h> @@ -140,8 +141,10 @@ extern Boolean no_locale; /* if True, use old (unlocalized) behaviour */ #define ANALOG_SIZE_DEFAULT 164 +#ifndef max #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b)) +#endif /* #define abs(a) ((a) < 0 ? -(a) : (a)) */ diff --git a/apps/xclock/makefile b/apps/xclock/makefile new file mode 100644 index 000000000..35bb8853d --- /dev/null +++ b/apps/xclock/makefile @@ -0,0 +1,38 @@ +WINAPP = xclock + +DEFINES += XT_NO_SM + +INCLUDELIBFILES = \ + $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \ + $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ + $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ + $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ + $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ + $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ + $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ + $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ + $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ + $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ + $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ + $(MHMAKECONF)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib \ + $(MHMAKECONF)\libxpm\src\$(OBJDIR)\libxpm.lib \ + $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \ + $(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \ + $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ + $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ + $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib + +LIBDIRS=$(dir $(INCLUDELIBFILES)) + +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) + +ifeq ($(DEBUG),1) +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib +else +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib +endif + +CSRCS = \ + Clock.c \ + xclock.c + diff --git a/apps/xwininfo/makefile b/apps/xwininfo/makefile new file mode 100644 index 000000000..d0b3abae0 --- /dev/null +++ b/apps/xwininfo/makefile @@ -0,0 +1,28 @@ +TTYAPP = xwininfo + +INCLUDELIBFILES = \ + $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ + $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ + $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ + $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ + $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ + $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ + $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ + $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ + $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ + $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ + $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \ + $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ + $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib + +ifeq ($(DEBUG),1) +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib +else +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib +endif + +CSRCS = \ + clientwin.c \ + dsimple.c \ + xwininfo.c + diff --git a/apps/xwininfo/xwininfo.c b/apps/xwininfo/xwininfo.c index 838408ab3..e5d70bcfb 100644 --- a/apps/xwininfo/xwininfo.c +++ b/apps/xwininfo/xwininfo.c @@ -56,6 +56,7 @@ of the copyright holder. #endif #include <stdio.h> #include <stdlib.h> +#include <unistd.h> /* Include routines to handle parsing defaults */ #include "dsimple.h" @@ -303,6 +304,7 @@ main(int argc, char **argv) register int i; int tree = 0, stats = 0, bits = 0, events = 0, wm = 0, size = 0, shape = 0; int frame = 0, children = 0; + int pauseatend = 0; Window window; INIT_NAME; @@ -378,6 +380,10 @@ main(int argc, char **argv) tree = stats = bits = events = wm = size = shape = 1; continue; } + if (!strcmp(argv[i], "-pause")) { + pauseatend = 1; + continue; + } usage(); } @@ -428,6 +434,7 @@ main(int argc, char **argv) if (shape) Display_Window_Shape(window); printf("\n"); + if (pauseatend) getchar(); exit(0); } |