Bladeren bron

🔨 Port libsdl2_net required for macOS simulator

Scott Lahteine 3 jaren geleden
bovenliggende
commit
9922410a73
2 gewijzigde bestanden met toevoegingen van 12 en 4 verwijderingen
  1. 5
    0
      Marlin/src/gcode/gcode.cpp
  2. 7
    4
      ini/native.ini

+ 5
- 0
Marlin/src/gcode/gcode.cpp Bestand weergeven

@@ -1100,6 +1100,9 @@ void GcodeSuite::process_next_command() {
1100 1100
  * G-code "macros" to be called from within other G-code handlers.
1101 1101
  */
1102 1102
 
1103
+#pragma GCC diagnostic push
1104
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
1105
+
1103 1106
 void GcodeSuite::process_subcommands_now(FSTR_P fgcode) {
1104 1107
   PGM_P pgcode = FTOP(fgcode);
1105 1108
   char * const saved_cmd = parser.command_ptr;        // Save the parser state
@@ -1117,6 +1120,8 @@ void GcodeSuite::process_subcommands_now(FSTR_P fgcode) {
1117 1120
   parser.parse(saved_cmd);                            // Restore the parser state
1118 1121
 }
1119 1122
 
1123
+#pragma GCC diagnostic pop
1124
+
1120 1125
 void GcodeSuite::process_subcommands_now(char * gcode) {
1121 1126
   char * const saved_cmd = parser.command_ptr;        // Save the parser state
1122 1127
   for (;;) {

+ 7
- 4
ini/native.ini Bestand weergeven

@@ -70,13 +70,16 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
70 70
 #
71 71
 # Simulator for macOS (MacPorts)
72 72
 #
73
-#  sudo port install gcc10 gdb glm libsdl2 freetype
73
+#  sudo port install gcc10 gdb glm libsdl2 libsdl2_net freetype
74 74
 #  sudo port install ld64 @3_3 +ld64_xcode
75
-#  sudo port uninstall ld64 ld64-latest
75
+#
76 76
 #  cd /opt/local/bin
77 77
 #  sudo rm -f gcc g++ cc
78
-#  sudo ln gcc-mp-10 gcc ; sudo ln g++-mp-10 g++ ; sudo ln g++ cc
79
-#  cd -
78
+#  sudo ln -s gcc-mp-10 gcc ; sudo ln -s g++-mp-10 g++ ; sudo ln -s g++ cc
79
+# This step may be obsolete:
80
+#  sudo port uninstall ld64 ld64-latest
81
+#
82
+# cd -
80 83
 #
81 84
 # Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
82 85
 # If Xcode is installed be sure to run `xcode-select --install` first.

Laden…
Annuleren
Opslaan