eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

TMTC + MGM Handler + Host build update #5

Closed
muellerr wants to merge 29 commits from mueller/master into develop
pull from: mueller/master
merge into: eive:develop
Conversation 1 Commits 29 Files Changed 32 +11 -3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2372ddef78 - Show all commits

12
Makefile-Hosted
View File

@ -17,12 +17,12 @@ CUSTOM_DEFINES :=
# (can be overriden by adding CHIP=chip and BOARD=board to the command-line) # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
BOARD_FILE_ROOT = bsp_hosted BOARD_FILE_ROOT = bsp_hosted
BOARD = host BOARD = host
OS_FSFW = host
CUSTOM_DEFINES += -D$(OS_FSFW)
DETECTED_OS :=
# Copied from stackoverflow, can be used to differentiate between Windows # Copied from stackoverflow, can be used to differentiate between Windows
# and Linux # and Linux
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
DETECTED_OS = WINDOWS
CUSTOM_DEFINES += -DWIN32 CUSTOM_DEFINES += -DWIN32
ifeq ($(PROCESSOR_ARCHITEW6432),AMD64) ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
CUSTOM_DEFINES += -DAMD64 CUSTOM_DEFINES += -DAMD64
@ -55,6 +55,14 @@ else
endif endif
endif endif
ifeq (${DETECTED_OS}, WINDOWS)
OS_FSFW = host
else
OS_FSFW = linux
endif
CUSTOM_DEFINES += -D$(OS_FSFW)
# General folder paths # General folder paths
FRAMEWORK_PATH = fsfw FRAMEWORK_PATH = fsfw
MISSION_PATH = mission MISSION_PATH = mission

2
tmtc

@ -1 +1 @@
Subproject commit e0c896e62d25286d00599ca57b71d0a3495ed95f Subproject commit 07b6a9df18baff999ca52c2f2781f8f77f8dcb65