MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🧑‍💻 Update Mac Sim directions

Browse Source
This commit is contained in:
Scott Lahteine 2022-07-12 13:25:36 -05:00
parent f543b3cb84
commit efe04e1016
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildroot/share/PlatformIO/debugging/launch.json
View File

@ -29,9 +29,9 @@
"request": "launch", "request": "launch",
"type": "cppdbg", "type": "cppdbg",
"cwd": "${workspaceRoot}", "cwd": "${workspaceRoot}",
"program": ".pio/build/simulator_macos_debug/debug/MarlinSimulator", "program": "${workspaceRoot}/.pio/build/simulator_macos_debug/debug/MarlinSimulator",
//"program": ".pio/build/simulator_linux_debug/MarlinSimulator", //"program": "${workspaceRoot}/.pio/build/simulator_linux_debug/MarlinSimulator",
//"program": ".pio/build/simulator_windows/MarlinSimulator", //"program": "${workspaceRoot}/.pio/build/simulator_windows/MarlinSimulator",
"miDebuggerPath": "/opt/local/bin/ggdb", "miDebuggerPath": "/opt/local/bin/ggdb",
"MIMode": "gdb" "MIMode": "gdb"
}, },
@ -40,9 +40,9 @@
"request": "launch", "request": "launch",
"type": "cppdbg", "type": "cppdbg",
"cwd": "${workspaceRoot}", "cwd": "${workspaceRoot}",
"program": ".pio/build/simulator_macos_debug/debug/MarlinSimulator", "program": "${workspaceRoot}/.pio/build/simulator_macos_debug/debug/MarlinSimulator",
//"program": ".pio/build/simulator_linux_debug/MarlinSimulator", //"program": "${workspaceRoot}/.pio/build/simulator_linux_debug/MarlinSimulator",
//"program": ".pio/build/simulator_windows/MarlinSimulator", //"program": "${workspaceRoot}/.pio/build/simulator_windows/MarlinSimulator",
//"targetArchitecture": "arm64", //"targetArchitecture": "arm64",
"MIMode": "lldb" "MIMode": "lldb"
} }

34
ini/native.ini
View File

@ -63,20 +63,36 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
# #
# Simulator for macOS (MacPorts) # Simulator for macOS (MacPorts)
# #
# sudo port install gcc11 gdb glm libsdl2 libsdl2_net freetype
# sudo port install ld64 @3_3 +ld64_xcode #
# MacPorts:
# sudo port install gcc11 glm libsdl2 libsdl2_net
# #
# cd /opt/local/bin # cd /opt/local/bin
# sudo rm -f gcc g++ cc # sudo rm -f gcc g++ cc
# sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc # sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc
# This step may be obsolete: # cd -
# sudo port uninstall ld64 ld64-latest # rehash
#
# cd -
# #
# Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed. # Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
# If Xcode is installed be sure to run `xcode-select --install` first. # If Xcode is installed be sure to run `xcode-select --install` first.
# #
#==================================================================================
#
# Homebrew:
# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
#
# brew install gcc@12 glm sdl2 sdl2_net
#
# cd /opt/homebrew/bin
# sudo rm -f gcc g++ cc
# sudo ln -s gcc-12 gcc ; sudo ln -s g++-12 g++ ; sudo ln -s g++ cc
# cd -
#
# Use 'brew install mesa' to get a <GL/gl.h> if no Xcode is installed.
# If Xcode is installed be sure to run `xcode-select --install` first.
#
[simulator_macos] [simulator_macos]
build_unflags = -lGL -fstack-protector-strong build_unflags = -lGL -fstack-protector-strong
build_flags = build_flags =
@ -110,7 +126,7 @@ custom_gcc = g++
# 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
# #
[env:simulator_windows] [env:simulator_windows]
extends = simulator_common extends = simulator_common
build_src_flags = ${simulator_common.build_src_flags} -fpermissive build_src_flags = ${simulator_common.build_src_flags} -fpermissive
build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
build_type = debug build_type = debug