fixed windows build problem

GaitRehabilitation · Jan 11, 2019 · be0b79f · be0b79f
1 parent 982efb5
commit be0b79f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -95,7 +95,7 @@ if (MSVC)
           platform/windows/common/DiscoveryAgent.h
   )
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
-
+  add_compile_definitions(_MBCS)
  add_compile_options("/std:c++14")
  include_directories(zlib)
   message(${Qt5Widgets_INCLUDE_DIRS}/QtZlib)

diff --git a/forms/mbientconfigpanel.cpp b/forms/mbientconfigpanel.cpp
@@ -2,6 +2,11 @@
 // Created by michaelpollind on 21/12/18.
 //
 
+//I have no idea windows
+#ifdef _WIN32
+    #include <windows.h>
+#endif
+
 #include "forms/mbientconfigpanel.h"
 #include "ui_mbientconfigpanel.h"
 
@@ -25,7 +30,6 @@ const float MbientConfigPanel::ACC_ODR_RANGE[] = {2.0f, 4.0f, 8.0f, 16.0f};
 const float MbientConfigPanel::ACC_FSR_RANGE[] = {12.5f, 50.f,100.0f,200.0f};
 const float MbientConfigPanel::FUSION_RANGE[] = {8.0f,12.5f,50.0f,100.0f};
 
-
 MbientConfigPanel::MbientConfigPanel(QWidget *parent) : QWidget(parent), ui(new Ui::MbientConfigPanel){
     ui->setupUi(this);
 
@@ -352,6 +356,6 @@ float MbientConfigPanel::toFusionSampleRangeIndex(int index) {
     if(index < 0 || index > 3){
         return 0;
     }
-    return FUSION_RANGE[index];
+    return MbientConfigPanel::FUSION_RANGE[index];
 }
 
diff --git a/forms/mbientconfigpanel.h b/forms/mbientconfigpanel.h
@@ -5,6 +5,7 @@
 #ifndef SMART_MBIENTCONFIGPANEL_H
 #define SMART_MBIENTCONFIGPANEL_H
 
+
 #include <QWidget>
 #include <QVariantMap>
 #include <3rdparty/mbientlab/src/metawear/sensor/gyro_bmi160.h>

diff --git a/platform/windows/common/DiscoveryAgent.h b/platform/windows/common/DiscoveryAgent.h
@@ -4,7 +4,6 @@
 #ifndef SMART_DISCOVERYAGENT_H
 #define SMART_DISCOVERYAGENT_H
 
-
 #include "common/BaseDiscoveryAgent.h"
 #include <pplawait.h>
 #include <Windows.Foundation.h>

diff --git a/platform/windows/common/metawearwrapper.h b/platform/windows/common/metawearwrapper.h
@@ -5,6 +5,7 @@
 #ifndef SMART_QTMETAWEARWRAPPER_H
 #define SMART_QTMETAWEARWRAPPER_H
 
+
 #include <QtCore/QPointer>
 #include "common/metawearwrapperbase.h"