windows build working
This commit is contained in:
parent
da79e0ec07
commit
e09027f601
@ -183,7 +183,6 @@ ifeq ($(DETECTED_OS), LINUX)
|
||||
CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TcUnixUdpPollingTask.cpp
|
||||
CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TmTcUnixUdpBridge.cpp
|
||||
endif
|
||||
# CXXSRC += Service17Test.cpp
|
||||
|
||||
# All C Sources included by .mk files are assigned here
|
||||
# Add the objects to sources so dependency handling works
|
||||
@ -255,7 +254,7 @@ CXXDEFINES := $(CUSTOM_DEFINES)
|
||||
CFLAGS +=
|
||||
CXXFLAGS += -I. $(DEBUG_LEVEL) $(WARNIING_FLAGS) $(I_INCLUDES) $(DEPFLAGS) \
|
||||
-fmessage-length=0 $(CXXDEFINES) $(OPTIMIZATION)
|
||||
CPPFLAGS += -std=c++17 -fno-exceptions
|
||||
CPPFLAGS += -std=c++2a -fno-exceptions
|
||||
ASFLAGS = -Wall -g $(OPTIMIZATION) $(I_INCLUDES) -D__ASSEMBLY__
|
||||
|
||||
# Flags for the linker call
|
||||
|
@ -2,12 +2,15 @@
|
||||
#include <fsfw/tasks/TaskFactory.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <version.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
|
||||
#ifdef WIN32
|
||||
static const char* COMPILE_PRINTOUT = "Windows";
|
||||
#elif LINUX
|
||||
static const char* COMPILE_PRINTOUT = "Linux";
|
||||
#else
|
||||
static const char* COMPILE_PRINTOUT = "unknown OS";
|
||||
#endif
|
||||
/**
|
||||
* @brief This is the main program for the hosted build. It can be run for
|
||||
* Linux and Windows.
|
||||
@ -16,13 +19,13 @@
|
||||
int main(void)
|
||||
{
|
||||
std::cout << "-- EIVE OBSW --" << std::endl;
|
||||
std::cout << "-- Compiled for Linux " << " --" << std::endl;
|
||||
std::cout << "-- Compiled for " << COMPILE_PRINTOUT << " --" << std::endl;
|
||||
std::cout << "-- Software version v" << SW_VERSION << "." << SW_SUBVERSION
|
||||
<< " -- " << std::endl;
|
||||
std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
|
||||
|
||||
InitMission::initMission();
|
||||
std::cout << std::endl;
|
||||
|
||||
for(;;) {
|
||||
// suspend main thread by sleeping it.
|
||||
TaskFactory::delayTask(5000);
|
||||
|
Loading…
Reference in New Issue
Block a user