renamed target simulation to x86

This commit is contained in:
Norym
2020-05-26 07:47:44 +02:00
parent 64adb557c8
commit 5d4cefdf66
14 changed files with 27 additions and 27 deletions

View File

@@ -4,11 +4,11 @@
#pragma once
#ifdef TARGET_SIMULATION
#ifdef TARGET_X86
#include "../../target/simulation/include/serial.h"
#include "../../target/simulation/include/manager.h"
#include "../../target/simulation/include/hwinit.h"
#include "../../target/x86/include/serial.h"
#include "../../target/x86/include/manager.h"
#include "../../target/x86/include/hwinit.h"
#elif TARGET_MAINUNIT

View File

@@ -13,33 +13,33 @@ fi
SOFTWARE_ROOT="${BASEDIR}/../.."
FIRMWARE_ROOT="${SOFTWARE_ROOT}/firmware"
CMAKE_TOOLCHAIN_FILES_ROOT="${FIRMWARE_ROOT}/helper"
CMAKE_TOOLCHAIN_FILE_SIMULATION="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.simulation"
CMAKE_TOOLCHAIN_FILE_X86="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.x86"
CMAKE_TOOLCHAIN_FILE_MAINUNIT="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.mainunit"
#build stuff
BUILD_ROOT="${BASEDIR}/../../../../build_womolin" # out of repo build
BUILD_SIMULATION_ROOT="${BUILD_ROOT}/simulation"
BUILD_X86_ROOT="${BUILD_ROOT}/x86"
BUILD_MAINUNIT_ROOT="${BUILD_ROOT}/mainunit"
DEBUG="debug"
RELEASE="release"
###############################
# x86 simulation debug version
# x86 debug version
###############################
#WOMOLIN_TARGET="TARGET_SIMULATION"
#TARGET_FOLDER="${BUILD_SIMULATION_ROOT}/${DEBUG}"
#CMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE_SIMULATION}"
#
#mkdir -p "${TARGET_FOLDER}"
#cd ${TARGET_FOLDER}
#
#cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
# -DCMAKE_BUILD_TYPE=${DEBUG} \
# -G "Eclipse CDT4 - Unix Makefiles" \
# ${FIRMWARE_ROOT}
#
#make
WOMOLIN_TARGET="TARGET_X86"
TARGET_FOLDER="${BUILD_X86_ROOT}/${DEBUG}"
CMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE_X86}"
mkdir -p "${TARGET_FOLDER}"
cd ${TARGET_FOLDER}
cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
-DCMAKE_BUILD_TYPE=${DEBUG} \
-G "Eclipse CDT4 - Unix Makefiles" \
${FIRMWARE_ROOT}
make
###########################
# mainunit debug version

View File

@@ -1,4 +1,4 @@
SET(WOMOLIN_TARGET "TARGET_SIMULATION")
SET(WOMOLIN_TARGET "TARGET_X86")
SET(CMAKE_CXX_COMPILER "/usr/bin/gcc")
SET(CMAKE_CXX_COMPILER "/usr/bin/g++")

View File

@@ -1,5 +1,5 @@
IF( ${WOMOLIN_TARGET} STREQUAL "TARGET_SIMULATION" )
add_subdirectory(simulation)
IF( ${WOMOLIN_TARGET} STREQUAL "TARGET_X86" )
add_subdirectory(x86)
ELSEIF( ${WOMOLIN_TARGET} STREQUAL "TARGET_MAINUNIT" )
add_subdirectory(mainunit)
ENDIF()

View File

@@ -4,11 +4,11 @@
#pragma once
#ifdef TARGET_SIMULATION
#ifdef TARGET_X86
#include "simulation/include/serial.h"
#include "simulation/include/manager.h"
#include "simulation/include/hwinit.h"
#include "x86/include/serial.h"
#include "x86/include/manager.h"
#include "x86/include/hwinit.h"
#elif TARGET_MAINUNIT