Fix Linux threading compile issues.

g4klx · Jun 6, 2016 · 277becc · 277becc
1 parent eba4dde
commit 277becc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@
 
 CC      = gcc
 CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x
-LIBS    =
+CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
+LIBS    = -lpthread
 LDFLAGS = -g
 
 OBJECTS = \

diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
@@ -2,7 +2,7 @@
 # Support for the Adafruit i2c 16 x 2 RGB LCD Pi Plate
 CC      = gcc
 CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
+CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 LDFLAGS = -g -L/usr/local/lib
 

diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
@@ -2,7 +2,7 @@
 
 CC      = gcc
 CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x -DHD44780 -I/usr/local/include
+CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 LDFLAGS = -g -L/usr/local/lib
 

diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
@@ -2,8 +2,8 @@
 
 CC      = gcc
 CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x -DOLED -I/usr/local/include
-LIBS    = -lArduiPi_OLED
+CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include
+LIBS    = -lArduiPi_OLED -lpthread
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = \

diff --git a/Thread.cpp b/Thread.cpp
@@ -61,6 +61,8 @@ void CThread::sleep(unsigned int ms)
 
 #else
 
+#include <unistd.h>
+
 CThread::CThread() :
 m_thread()
 {

diff --git a/Thread.h b/Thread.h
@@ -41,7 +41,7 @@ class CThread
 
 private:
 #if defined(_WIN32) || defined(_WIN64)
-	HANDLE    m_handle;
+  HANDLE    m_handle;
 #else
   pthread_t m_thread;
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ void CThread::sleep(unsigned int ms) @@
     #else
+    #include <unistd.h>
     CThread::CThread() :
     m_thread()
     {
@@ Expand Down @@