From dc14f8cb76f2b5b823289c42af715b836295d964 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Wed, 28 Sep 2011 06:12:17 +0000 Subject: [PATCH] Make settings configurable --- makefile | 4 ++-- sys-x11.c | 2 ++ wm-wmii.c | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 4900ee5..68b8cf3 100644 --- a/makefile +++ b/makefile @@ -7,11 +7,11 @@ CFLAGS=-g -Werror -Wall LIBS=-Wl,--as-needed -lX11 -lXinerama TEST=DISPLAY=:2.0 -WIN32= +WIN32?= ifdef WIN32 SYS=win32 CC=i686-pc-mingw32-gcc -CFLAGS=-g -Werror -Wall -D_NO_OLDNAMES +CFLAGS=-g -Werror -Wall -D_NO_OLDNAMES -DMARGIN=15 LIBS= PROG=awm.exe TEST=cp -t /t/htdocs/temp diff --git a/sys-x11.c b/sys-x11.c index 3fc4ed7..8b4ecfa 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -12,7 +12,9 @@ #include "sys.h" #include "wm.h" +#ifndef BORDER #define BORDER 2 +#endif /* Internal structures */ struct win_sys { diff --git a/wm-wmii.c b/wm-wmii.c index 491d1bb..82363ef 100644 --- a/wm-wmii.c +++ b/wm-wmii.c @@ -5,9 +5,15 @@ #include "sys.h" #include "wm.h" +#ifndef MODKEY #define MODKEY alt +#endif +#ifndef MARGIN #define MARGIN 0 +#endif +#ifndef STACK #define STACK 25 +#endif /* Enums */ typedef enum { -- 2.43.2