- Amended Makefile so it compiles on Ubuntu 13.04 (tested and frameserver runs and compiles…)

- Added more config details to README
- Adapted test.cpp but it still doesn't compile
master
Steve Clement 2013-07-16 18:03:18 +02:00
parent 6b3899c141
commit 9d3450a5e6
3 changed files with 26 additions and 4 deletions

22
README
View File

@ -2,3 +2,25 @@ Install dependencies:
sudo apt-get install libboost-all-dev libncurses5-dev libglibmm-2.4-dev build-essential 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

View File

@ -1,6 +1,6 @@
frameserver: 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: 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: thread_test:
g++ -O2 -pipe -fomit-frame-pointer thread.cc -o thread `pkg-config --cflags --libs glibmm-2.4` g++ -O2 -pipe -fomit-frame-pointer thread.cc -o thread `pkg-config --cflags --libs glibmm-2.4`

View File

@ -31,8 +31,8 @@ int main(void)
buffers = new Buffers(NUMBUFS); buffers = new Buffers(NUMBUFS);
vector<Glib::Threads::Thread::*> readers; vector<Glib::Threads::Thread*> readers;
vector<Glib::Threads::Thread::*> writers; vector<Glib::Threads::Thread*> writers;
for(int i = 0; i < NUMTHREADS; i++) for(int i = 0; i < NUMTHREADS; i++)
{ {