compiles and runs on Linux

src/HockeyData_2.cpp

@@ -1,4 +1,5 @@
 #include "HockeyData.h"
+#include "utility.h"
 
 int invertTime( unsigned char period, int timeleft, int perlen, int otlen ) {
 	// figure out time until next change of status

src/HockeyLogic.cpp

@@ -1200,7 +1200,7 @@ void HockeyLogic::logicSync(HockeyData* data, HockeyDraw* hd, Keybuffer* kbuf, H
 			disp[19] = (data->sync_tr) ? "READ 7-SEG CLOCK" : "READ GREEN LIGHT";
 			disp[21] = (data->use_tenths) ? "YES" : "NO";
 			port = data->ssync.get_port();
-			if (!data->ssync.valid( )) disp[10] = "Currently using port: NONE";
+			if (!data->ssync.ok( )) disp[10] = "Currently using port: NONE";
 			else disp[10] = "Currently using port: COM" + int2str(port);
 			minor = 1;
 			kbuf->clear();

src/Makefile

@@ -6,6 +6,7 @@ hockeyboard_OBJECTS = \
 	GLCairoSurface.o \
 	GLCairoTextSurface.o \
 	HockeyData.o \
+	HockeyData_2.o \
 	HockeyDraw.o \
 	HockeyDrop.o \
 	HockeyLogic.o \
@@ -16,12 +17,17 @@ hockeyboard_OBJECTS = \
 	main.o \
 	Mclock.o \
 	mouse.o \
-	serialsync.o \
+	serialsync_unix.o \
 	settings.o \
 	timegettime.o \
 
-hockeyboard_LIBS = -lcairo -lpango -lGL -lGLUT
-CXX=gcc
+hockeyboard_LIBS = -lGL -lGLU -lglut
+hockeyboard_LIBS += `pkg-config --libs freetype2`
+hockeyboard_LIBS += `pkg-config --libs cairo`
+hockeyboard_LIBS += `pkg-config --libs pango`
+hockeyboard_LIBS += `pkg-config --libs pangocairo`
+
+CXX=g++
 CFLAGS=-g -O2
 
 CFLAGS += `pkg-config --cflags freetype2`

src/main.cpp

@@ -207,6 +207,7 @@ int main( int argc, char* argv[] ) {
 
 	// load fonts
 	base = new freetype::font_data;
+#ifdef WINDOWS
 	try {
 		string fontdir = string(getenv("WINDIR"));
 		fontdir += "\\Fonts\\";
@@ -216,7 +217,11 @@ int main( int argc, char* argv[] ) {
 	catch (std::runtime_error e) {
 		quit(1);
 	}
-
+#else
+    fprintf(stderr, "Initialize base\n");
+    base->init("DejaVuSansMono.ttf", 12, 16, 255);
+#endif
+    fprintf(stderr, "Initialize state\n");
 	// generate data object
 	data = new HockeyData;
 	logic = new HockeyLogic;
@@ -247,6 +252,7 @@ int main( int argc, char* argv[] ) {
 	// new draw code
 	hd = new HockeyDraw;
 
+    fprintf(stderr, "Load settings...\n");
 	load_settings("settings.ini");
 
 	// setup window callbacks
@@ -258,9 +264,10 @@ int main( int argc, char* argv[] ) {
 	glutPassiveMotionFunc( mousemove );
 	glutMouseFunc( mouseclick );
 
-
+    fprintf(stderr, "GLUT main loop...\n");
 	// enter main loop
     glutMainLoop();
+    fprintf(stderr, "Done!\n");
 
 	quit(0);
 	return 0;

src/serialsync_unix.cpp

@@ -1,11 +1,14 @@
 #include "serialsync.h"
+#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
 
 // counts '1' bits in a nibble (4 bit value)
 const unsigned char bitcount[] = { 0, 1, 1, 2, 1, 2, 2, 3,
 								   1, 2, 2, 3, 2, 3, 3, 4 };
 
 SerialSync::SerialSync() {
-	hSerial = NULL;
+	portfd = -1;
 	port = -1;
 }
 
@@ -31,7 +34,7 @@ bool SerialSync::port_open(int p) {
 
     portfd = open(s, O_RDWR | O_NOCTTY);
 
-    if (tcgetattr(fd, &attr) != 0) {
+    if (tcgetattr(portfd, &attr) != 0) {
         perror("tcgetattr");
         port = -1;
         return false;
@@ -42,7 +45,7 @@ bool SerialSync::port_open(int p) {
     cfsetispeed(&attr, B2400);
     cfsetospeed(&attr, B2400);
     /* 8N1 default?? */
-    if (tcsetattr(fd, TCSAFLUSH, &attr) != 0) {
+    if (tcsetattr(portfd, TCSAFLUSH, &attr) != 0) {
         perror("tcsetattr");
         port = -1;
         return false;

src/timegettime.cpp

@@ -29,7 +29,7 @@ uint32_t timeGetTime(void) {
     }
 
     /* subtract tv_initial from tv */
-    useconds = tv.seconds - tv_initial.seconds;
+    useconds = tv.tv_sec - tv_initial.tv_sec;
     useconds *= 1000000;
     useconds += tv.tv_usec;
     useconds -= tv_initial.tv_usec;