diff --git a/src/GUI/i7z_GUI.cpp b/src/GUI/i7z_GUI.cpp index 4c51ede..368acd5 100644 --- a/src/GUI/i7z_GUI.cpp +++ b/src/GUI/i7z_GUI.cpp @@ -33,7 +33,9 @@ #ifndef UINT32_MAX # define UINT32_MAX (4294967295U) #endif +extern "C" { #include "../helper_functions.c" +} #define MAX_PROCESSORS_GUI 12 diff --git a/src/GUI/i7z_GUI.pro b/src/GUI/i7z_GUI.pro index 76dcb71..4af29cc 100644 --- a/src/GUI/i7z_GUI.pro +++ b/src/GUI/i7z_GUI.pro @@ -9,7 +9,6 @@ INCLUDEPATH += . CONFIG += debug CFLAGS += #QMAKE_*FLAGS are where the gcc flags should be passed CXXFLAGS += -QMAKE_CFLAGS += -v -fno-schedule-insns2 -fno-schedule-insns -fno-inline-small-functions -fno-caller-saves -QMAKE_CXXFLAGS += -v -fno-schedule-insns2 -fno-schedule-insns -fno-inline-small-functions -fno-caller-saves # Input -SOURCES += i7z_GUI.cpp +SOURCES += i7z_GUI.cpp ../log.c +LIBS += -lncurses diff --git a/src/helper_functions.c b/src/helper_functions.c index 9ad6199..f3dbf12 100644 --- a/src/helper_functions.c +++ b/src/helper_functions.c @@ -37,8 +37,6 @@ #include #include "i7z.h" -#define quiet false - extern struct program_options prog_options; bool E7_mp_present=false; @@ -318,8 +316,8 @@ void Print_Information_Processor(bool* nehalem, bool* sandy_bridge, bool* ivy_br get_familyinformation (&proc_info); print_family_info (&proc_info); - debug(quiet, "msr = Model Specific Register"); - print_model(quiet, proc_info.model, proc_info.extended_model); + debug(prog_options.quiet, "msr = Model Specific Register"); + print_model(prog_options.quiet, proc_info.model, proc_info.extended_model); if (proc_info.family >= 0x6) { if (proc_info.extended_model >= 0x3) { if (proc_info.model == 0xA) {