From 5d2da2bf60d6c3e9a1dc5f4581ec99462400a58e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 21 Dec 2020 17:52:53 +0100 Subject: [PATCH] makefile hosted update --- Makefile-Hosted | 12 ++++++++++-- tmtc | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile-Hosted b/Makefile-Hosted index 807fe5ec..49460898 100644 --- a/Makefile-Hosted +++ b/Makefile-Hosted @@ -17,12 +17,12 @@ CUSTOM_DEFINES := # (can be overriden by adding CHIP=chip and BOARD=board to the command-line) BOARD_FILE_ROOT = bsp_hosted BOARD = host -OS_FSFW = host -CUSTOM_DEFINES += -D$(OS_FSFW) +DETECTED_OS := # Copied from stackoverflow, can be used to differentiate between Windows # and Linux ifeq ($(OS),Windows_NT) + DETECTED_OS = WINDOWS CUSTOM_DEFINES += -DWIN32 ifeq ($(PROCESSOR_ARCHITEW6432),AMD64) CUSTOM_DEFINES += -DAMD64 @@ -55,6 +55,14 @@ else endif endif +ifeq (${DETECTED_OS}, WINDOWS) +OS_FSFW = host +else +OS_FSFW = linux +endif + +CUSTOM_DEFINES += -D$(OS_FSFW) + # General folder paths FRAMEWORK_PATH = fsfw MISSION_PATH = mission diff --git a/tmtc b/tmtc index e0c896e6..07b6a9df 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e0c896e62d25286d00599ca57b71d0a3495ed95f +Subproject commit 07b6a9df18baff999ca52c2f2781f8f77f8dcb65