Merge branch 'graphwork2' into graphwork

diff --git a/client/Makefile b/client/Makefile
index 3b4ce89e2f62b07791ac120b3d1901889632bc0d..cea981f90b29e15e6360aa3c7f01267b9c4ba049 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,29 +19,14 @@ OBJDIR = obj
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
-LUAPLATFORM = generic
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3
+CXXFLAGS = -std=c++11 -fPIC -Wall -O3
 
+LUAPLATFORM = generic
 platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform)))
-    CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-    ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
-        CXXFLAGS += -I$(QTDIR)/include/QtWidgets
-        QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets
-    else
-        QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-    endif
-    MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
 else
-       CXXFLAGS = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) -Wall -O4
-       QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
-       MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
-       ifeq ($(QTLDLIBS), )
-               CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
-               QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-               MOC = $(shell pkg-config --variable=moc_location QtCore)
-       endif
        ifeq ($(platform),Darwin)
                LUAPLATFORM = macosx
        else
@@ -51,7 +36,31 @@ else
        endif
 endif
 
-ifneq ($(QTLDLIBS),)
+# Check for correctly configured Qt5
+QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null)
+QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
+MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
+ifeq ($(QTINCLUDES), )
+# if Qt5 not found Check for correctly configured Qt4  
+       QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
+       QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+       MOC = $(shell pkg-config --variable=moc_location QtCore)
+endif
+ifeq ($(QTINCLUDES), )
+# if both pkg-config commands failed, search in common places
+       ifneq ($(QTDIR), )
+               QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+               QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+               ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+                       QTINCLUDES += -I$(QTDIR)/include/QtWidgets
+                       QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
+               endif
+               MOC = $(QTDIR)/bin/moc
+       endif
+endif
+
+
+ifneq ($(QTLDLIBS), )
     QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
 else
@@ -193,7 +202,7 @@ $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
 
 %.o: %.cpp
 $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
-       $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
+       $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
        $(POSTCOMPILE)
 
 

diff --git a/client/cmddata.c b/client/cmddata.c
index 8c2049ad1cbf4af9f6c68f860a6d1833a912d609..e291c9243fe448ff406493923d6ef9fe9ad63a84 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -807,8 +807,8 @@ int FSKrawDemod(const char *Cmd, bool verbose)
        if (size > 0) {
                setDemodBuf(BitStream,size,0);
                setClockGrid(rfLen, startIdx);
-       
-               // Now output the bitstream to the scrollback by line of 16 bits
+
+    // Now output the bitstream to the scrollback by line of 16 bits
                if (verbose || g_debugMode) {
                        PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow);
                        PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert));
@@ -1070,7 +1070,8 @@ void setClockGrid(int clk, int offset) {
        g_DemodStartIdx = offset;
        g_DemodClock = clk;
        if (g_debugMode) PrintAndLog("demodoffset %d, clk %d",offset,clk);
-       if (offset > clk) offset %= clk;
+
+  if (offset > clk) offset %= clk;
        if (offset < 0) offset += clk;
 
        if (offset > GraphTraceLen || offset < 0) return;

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index c1fc7e12fcd77c7ecb04106c5ddb3765fa6ed950..c1541999265ec80786f23f90e91e03606c80df70 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------------
 // GUI (QT)
 //-----------------------------------------------------------------------------
+#include "proxguiqt.h"
 
 #include <iostream>
 #include <QPainterPath>