Merge upstream changes from Marlin 2.1.2.1
This commit is contained in:
@@ -26,6 +26,8 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
|
||||
# Native Simulation
|
||||
# Builds with a small subset of available features
|
||||
# Required system libraries: SDL2, SDL2-net, OpenGL, GLM
|
||||
# sudo apt-get install python3-venv build-essential libsdl2-dev libsdl2-net-dev libglm-dev
|
||||
# See https://docs.platformio.org/en/latest/platforms/native.html for more information
|
||||
#
|
||||
# Tested with Linux (Mint 20) : gcc [9.3.0, 10.2.0]: libsdl2-dev[2.0.10], libsdl2-net-dev[2.0.1], libglm-dev[0.9.9.7, 0.9.9.8]
|
||||
#
|
||||
@@ -35,13 +37,13 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
|
||||
platform = native
|
||||
framework =
|
||||
build_flags = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
|
||||
build_src_flags = -Wall -Wno-expansion-to-defined -Wcast-align
|
||||
build_src_flags = -Wall -Wno-expansion-to-defined -Wno-deprecated-declarations -Wcast-align
|
||||
release_flags = -g0 -O3 -flto
|
||||
debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
|
||||
lib_compat_mode = off
|
||||
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
|
||||
lib_deps = ${common.lib_deps}
|
||||
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.0.x.zip
|
||||
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip
|
||||
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
|
||||
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
|
||||
extra_scripts = ${common.extra_scripts}
|
||||
@@ -123,8 +125,12 @@ custom_gcc = g++
|
||||
# Simulator for Windows 10
|
||||
#
|
||||
# MSYS2 mingw-w64-x86_64 with these packages:
|
||||
# pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
|
||||
# pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
|
||||
#
|
||||
# Ensure the following paths have been added to the PATH system environment variable:
|
||||
# C:\msys64\mingw64\bin, C:\msys64\ucrt64\bin, C:\msys64\usr\bin
|
||||
#
|
||||
|
||||
[env:simulator_windows]
|
||||
extends = simulator_common
|
||||
build_src_flags = ${simulator_common.build_src_flags} -fpermissive
|
||||
|
Reference in New Issue
Block a user