Continued connecting in Xinerama

2 files changed, 9 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index a19be5b..c2ff382 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,15 @@
 RES = /usr/share/nyancat
 BIN = /usr/bin/nyancat
 LIBS = -lSDL -lSDL_image -lSDL_mixer
-FLAGS = -Wall
+FLAGS = -pedantic -Wall -O0 -std=c99
+INCS = -I. -I/usr/include ${XINERAMAINC}
+
+XINERAMAINC = -I/usr/X11R6/include
+XINERAMALIBS = -L/usr/X11R6/lib -lXinerama
+XINERAMAFLAGS = -DXINERAMA
 
 nyancat:  nyan.c
-	cc -g nyan.c -o nyancat ${LIBS} ${FLAGS}
+	cc -g nyan.c -o nyancat ${LIBS} ${XINERAMALIBS} ${XINERAMAINC} ${FLAGS} ${XINERAMAFLAGS}
 
 install:
 	cp nyancat ${BIN}
diff --git a/nyan.c b/nyan.c
index cf708ce..2245940 100644
--- a/nyan.c
+++ b/nyan.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>

 #include <time.h>

 #ifdef XINERAMA

+#include <X11/Xlib.h>

 #include <X11/extensions/Xinerama.h>

 #endif /* XINERAMA */

 

@@ -64,6 +65,7 @@ static                  SDL_Event event;
 static int              running = 1;

 static int              SURF_TYPE = SDL_HWSURFACE;

 

+static Display* dpy;

 static SDL_Surface* cat_img[5];

 static SDL_Surface* sparkle_img[5];

 static Mix_Music* music;