wmii

commit f6abe35c21afafd871fbacdb275f0c7212284a6a
parent aaad685adbda90d93609f3443774cc33310faef6
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Sat, 21 Jan 2006 13:57:20 +0200

applied patches to allow compilation on SunOS


Diffstat:
cmd/Makefile
 | 
17
+++++++++++++++++
cmd/wm/Makefile.wm
 | 
2
++
cmd/wm/wm.h
 | 
1
+
cmd/wmiibar.c
 | 
1
+
cmd/wmiikeys.c
 | 
1
+
cmd/wmiimenu.c
 | 
1
+
cmd/wmiiwarp.c
 | 
1
+
config.mk
 | 
7
+++++--

8 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/cmd/Makefile b/cmd/Makefile
@@ -46,32 +46,49 @@ all: wmiibar wmiibar2 wmiimenu wmiir wmiir2 wmiifs wmiikeys wmiiplumb wmiiwarp
 wmiibar: ${OBJ_bar}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_bar} ${LDFLAGS}
+# Solaris
+#	@${CC} -o $@ ${OBJ_bar} ${LDFLAGS} -lsocket
+
 
 wmiibar2: ${OBJ_bar2}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_bar2} ${LDFLAGS2}
+# Solaris
+#	@${CC} -o $@ ${OBJ_bar2} ${LDFLAGS2} -lsocket
 
 wmiimenu: ${OBJ_menu}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_menu} ${LDFLAGS}
+# Solaris
+#	@${CC} -o $@ ${OBJ_menu} ${LDFLAGS} -lsocket
 
 wmiir2: ${OBJ_r2}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_r2} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
 		-L../libixp2 -lixp -L../libcext -lcext
+# Solaris
+#	@${CC} -o $@ ${OBJ_r2} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
+#		-L../libixp2 -lixp -L../libcext -lcext -lsocket
 
 wmiir: ${OBJ_r}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_r} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
 		-L../libixp -lixp -L../libcext -lcext
+# Solaris
+#	@${CC} -o $@ ${OBJ_r} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
+#		-L../libixp -lixp -L../libcext -lcext -lsocket
 
 wmiifs: ${OBJ_fs}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_fs} ${LDFLAGS}
+# Solaris
+#	@${CC} -o $@ ${OBJ_fs} ${LDFLAGS} -lsocket
 
 wmiikeys: ${OBJ_keys}
 	@echo LD $@
 	@${CC} -o $@ ${OBJ_keys} ${LDFLAGS}
+# Solaris
+#	@${CC} -o $@ ${OBJ_keys} ${LDFLAGS} -lsocket
 
 wmiiplumb: ${OBJ_plumb}
 	@echo LD $@
diff --git a/cmd/wm/Makefile.wm b/cmd/wm/Makefile.wm
@@ -7,6 +7,8 @@ CFLAGS   += -I../../liblitz -I../../libixp -I../../libwmii \
             -I../../libcext
 LDFLAGS  += -L../../liblitz -llitz -L../../libixp -lixp \
             -L../../libwmii -lwmii -L../../libcext -lcext
+# Solaris
+# LDFLAGS += -lsocket
 
 SRC      = wm.c client.c event.c mouse.c frame.c page.c layoutdef.c layout.c
 
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "wmii.h"
diff --git a/cmd/wmiibar.c b/cmd/wmiibar.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/Xproto.h>
diff --git a/cmd/wmiikeys.c b/cmd/wmiikeys.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
diff --git a/cmd/wmiimenu.c b/cmd/wmiimenu.c
@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <time.h>
+#include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/Xproto.h>
diff --git a/cmd/wmiiwarp.c b/cmd/wmiiwarp.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
diff --git a/config.mk b/config.mk
@@ -14,12 +14,15 @@ VERSION = 3-current
 # includes and libs
 LIBS = -L${PREFIX}/lib -L/usr/lib -lc -lm -L${X11LIB} -lX11
 
-# flags
-# Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
+# Linux/BSD
 CFLAGS = -g -Wall -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 	-DVERSION=\"${VERSION}\"
 LDFLAGS = -g ${LIBS}
 
+# Solaris
+#CFLAGS = -fast -xtarget=ultra ${INCLUDES} -DVERSION=\"${VERSION}\"
+# Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
+
 AR = ar cr
 CC = cc
 RANLIB = ranlib