Merge pull request #969 from frogonwheels/fix-defines-compile

Fix compile with reduced feature set
openvehicles · Feb 24, 2024 · c8da884 · c8da884
2 parents 8798fbe + a0e605f
commit c8da884
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/vehicle/OVMS.V3/components/ovms_plugins/CMakeLists.txt b/vehicle/OVMS.V3/components/ovms_plugins/CMakeLists.txt
@@ -3,7 +3,7 @@ set(include_dirs)
 
 if (CONFIG_OVMS_COMP_PLUGINS)
   list(APPEND include_dirs "src")
-if (CONFIG_OVMS_SC_JAVASCRIPT_DUKTAPE)
+if (CONFIG_OVMS_COMP_PLUGINS)
   list(APPEND srcs "src/ovms_plugins.cpp")
 endif ()
 endif ()

diff --git a/vehicle/OVMS.V3/components/ovms_plugins/src/ovms_plugins.cpp b/vehicle/OVMS.V3/components/ovms_plugins/src/ovms_plugins.cpp
@@ -46,7 +46,9 @@ static const char *TAG = "pluginstore";
 #include "ovms_http.h"
 #include "ovms_buffer.h"
 #include "ovms_netmanager.h"
+#ifdef CONFIG_OVMS_SC_JAVASCRIPT_DUKTAPE
 #include "ovms_duktape.h"
+#endif
 
 #ifdef CONFIG_OVMS_COMP_WEBSERVER
 #include "ovms_webserver.h"
@@ -503,6 +505,7 @@ void OvmsPluginStore::LoadEnabledModules(plugin_element_type_t type)
             {
             if ((type==EL_MODULE) && (e->m_type == EL_MODULE))
               {
+#ifdef CONFIG_OVMS_SC_JAVASCRIPT_DUKTAPE
               // Load an enabled script module
               const char* filename = "LoadEnabledModules";
               duk_context* ctx = MyDuktape.DukTapeContext();
@@ -526,6 +529,7 @@ void OvmsPluginStore::LoadEnabledModules(plugin_element_type_t type)
                 }
               duk_pop(ctx);
               ESP_LOGI(TAG,"  Load %s script %s", p.m_name.c_str(), e->m_path.c_str());
+#endif
               }
             #ifdef CONFIG_OVMS_COMP_WEBSERVER
             else if ((type==EL_WEB_PAGE) && (e->m_type == EL_WEB_PAGE))

diff --git a/vehicle/OVMS.V3/main/ovms_metrics.cpp b/vehicle/OVMS.V3/main/ovms_metrics.cpp
@@ -47,6 +47,7 @@ static const char *TAG = "metrics";
 #include <iomanip>
 #include <locale>
 #include <time.h>
+#include <math.h>
 
 using namespace std;
 

diff --git a/vehicle/OVMS.V3/main/ovms_netmanager.cpp b/vehicle/OVMS.V3/main/ovms_netmanager.cpp
@@ -37,6 +37,11 @@ static const char *TAG = "netmanager";
 #include <lwip/ip_addr.h>
 #include <lwip/netif.h>
 #include <lwip/dns.h>
+#include <lwip/opt.h>
+#include <lwip/sockets.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include "metrics_standard.h"
 #include "ovms_peripherals.h"