From 3a5b92ea49ed44b41a978956e0ec5ee3b9819b7a Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Fri, 31 Mar 2017 10:36:51 +0200 Subject: [PATCH] Fixed Posix simulator. --- firmware/ChibiOS | 2 +- win32_functional_tests/Makefile | 6 +++++- win32_functional_tests/simulator/global.h | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/firmware/ChibiOS b/firmware/ChibiOS index 5a09c430bb..3619aac78f 160000 --- a/firmware/ChibiOS +++ b/firmware/ChibiOS @@ -1 +1 @@ -Subproject commit 5a09c430bb5e38957cb45ca307abaa24e2062eae +Subproject commit 3619aac78fcf83f102df27bdf47a6e349aebc4aa diff --git a/win32_functional_tests/Makefile b/win32_functional_tests/Makefile index a6caec3359..4510265acd 100644 --- a/win32_functional_tests/Makefile +++ b/win32_functional_tests/Makefile @@ -93,7 +93,7 @@ include $(CHIBIOS)/os/various/shell/shell.mk ifeq ($(OS),Windows_NT) include ${CHIBIOS}/os/hal/ports/simulator/win32/platform.mk else - include ${CHIBIOS}/os/hal/ports/simulator/Posix/platform.mk + include ${CHIBIOS}/os/hal/ports/simulator/posix/platform.mk endif include $(PROJECT_DIR)/util/util.mk @@ -247,7 +247,11 @@ UINCDIR = ULIBDIR = # List all user libraries here +ifeq ($(OS),Windows_NT) ULIBS = -lws2_32 +else +ULIBS = +endif # # End of user defines diff --git a/win32_functional_tests/simulator/global.h b/win32_functional_tests/simulator/global.h index ed00e2a0f3..b05100588f 100644 --- a/win32_functional_tests/simulator/global.h +++ b/win32_functional_tests/simulator/global.h @@ -7,6 +7,13 @@ #include #include "efifeatures.h" + +#if EFI_SIMULATOR +#include +#include +#include +#endif + #include "rusefi_enums.h" #include "auto_generated_enums.h" #include "obd_error_codes.h"