From 9d3450a5e62aa545676cb4be4f39eba790b2838e Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 16 Jul 2013 18:03:18 +0200
Subject: [PATCH] =?UTF-8?q?-=20Amended=20Makefile=20so=20it=20compiles=20o?=
 =?UTF-8?q?n=20Ubuntu=2013.04=20(tested=20and=20frameserver=20runs=20and?=
 =?UTF-8?q?=20compiles=E2=80=A6)=20-=20Added=20more=20config=20details=20t?=
 =?UTF-8?q?o=20README=20-=20Adapted=20test.cpp=20but=20it=20still=20doesn'?=
 =?UTF-8?q?t=20compile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README               | 22 ++++++++++++++++++++++
 frameserver/Makefile |  4 ++--
 frameserver/test.cpp |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 2832cf9..066dd2e 100644
--- a/README
+++ b/README
@@ -2,3 +2,25 @@ Install dependencies:
 
 sudo apt-get install libboost-all-dev libncurses5-dev libglibmm-2.4-dev build-essential
 
+= Building configuration =
+
+The main configuration of the frameserver is done in <defines.h>
+
+Main tuneables:
+
+#define REMOTE_IP "127.0.0.1"
+#define REMOTE_PORT 1234
+
+#define HASH "abcdefghij"
+// one byte number + 10 character hash plus newline
+#define HEADEROFFSET 12
+
+// 12 windows per floor, 7 floors, Value:Alpha
+#define WIDTH 12
+#define HEIGHT 7
+#define CHANNELS 2
+
+// 8 segments per window, 12 segments per floor, RGBA
+#define SEGNUM 8
+#define SEGWIDTH 12
+#define SEGCHANNELS 4
diff --git a/frameserver/Makefile b/frameserver/Makefile
index 38282dd..a0216d4 100644
--- a/frameserver/Makefile
+++ b/frameserver/Makefile
@@ -1,6 +1,6 @@
 frameserver:
-	g++ -O2 -ggdb -lncurses Buffer.cpp Buffers.cpp Server.cpp frameserver.cpp `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0` -lboost_system -o frameserver
+	g++ -O2 -ggdb Buffer.cpp Buffers.cpp Server.cpp frameserver.cpp `pkg-config --libs --cflags ncurses` `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0` -lboost_system -o frameserver
 test:
-	g++ -O2 -pipe -fomit-frame-pointer Buffer.cpp Buffers.cpp test.cpp `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0`  -o test 
+	g++ -O2 -pipe -fpermissive -fomit-frame-pointer Buffer.cpp Buffers.cpp test.cpp `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0`  -o test 
 thread_test:
 	g++ -O2 -pipe -fomit-frame-pointer thread.cc -o thread `pkg-config --cflags --libs glibmm-2.4`
diff --git a/frameserver/test.cpp b/frameserver/test.cpp
index 23f851f..2d97c4d 100644
--- a/frameserver/test.cpp
+++ b/frameserver/test.cpp
@@ -31,8 +31,8 @@ int main(void)
 
   buffers = new Buffers(NUMBUFS);
 
-  vector<Glib::Threads::Thread::*> readers;
-  vector<Glib::Threads::Thread::*> writers;
+  vector<Glib::Threads::Thread*> readers;
+  vector<Glib::Threads::Thread*> writers;
 
   for(int i = 0; i < NUMTHREADS; i++)
   {