Make settings configurable

diff --git a/makefile b/makefile
index 4900ee57be91ce841559a82000438fd35a726469..68b8cf382a30c46b26b9e82db4a41addf49b0679 100644 (file)
--- a/makefile
+++ b/makefile
@@ -7,11 +7,11 @@ CFLAGS=-g -Werror -Wall
 LIBS=-Wl,--as-needed -lX11 -lXinerama
 TEST=DISPLAY=:2.0
 
 LIBS=-Wl,--as-needed -lX11 -lXinerama
 TEST=DISPLAY=:2.0
 

-WIN32=
+WIN32?=

 ifdef WIN32
 SYS=win32
 CC=i686-pc-mingw32-gcc
 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
 LIBS=
 PROG=awm.exe
 TEST=cp -t /t/htdocs/temp

diff --git a/sys-x11.c b/sys-x11.c
index 3fc4ed7f7d7a02a7e6e935b49895b5000173a7a7..8b4ecfa501e237e2e9a1cde772d90a61086211a0 100644 (file)
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -12,7 +12,9 @@
 #include "sys.h"
 #include "wm.h"
 
 #include "sys.h"
 #include "wm.h"
 

+#ifndef BORDER

 #define BORDER 2
 #define BORDER 2

+#endif

 
 /* Internal structures */
 struct win_sys {
 
 /* Internal structures */
 struct win_sys {

diff --git a/wm-wmii.c b/wm-wmii.c
index 491d1bb7b5d428f35261ad42e41f525edff7e2a9..82363ef01620aba24d7880b6cc20e2c68b0976ec 100644 (file)
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -5,9 +5,15 @@
 #include "sys.h"
 #include "wm.h"
 
 #include "sys.h"
 #include "wm.h"
 

+#ifndef MODKEY

 #define MODKEY alt
 #define MODKEY alt

+#endif
+#ifndef MARGIN

 #define MARGIN 0
 #define MARGIN 0

+#endif
+#ifndef STACK

 #define STACK  25
 #define STACK  25

+#endif

 
 /* Enums */
 typedef enum {
 
 /* Enums */
 typedef enum {