Skip to content

Commit

Permalink
Merge branch 'release/v1.0.x' into bugfix/wificlient_MSYS_188
Browse files Browse the repository at this point in the history
  • Loading branch information
nhjschulz authored Nov 20, 2024
2 parents 40e0cfa + eeb2d2b commit 7aef35d
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ extends = mode:release_native
build_flags =
${mode:release_native.build_flags}


; ********************************************************************************
; Select esp32 build mode here!
; ********************************************************************************
Expand Down Expand Up @@ -102,15 +101,15 @@ build_flags =
-D TRANSPORT_USE_TCP=1
-D_USE_MATH_DEFINES
-D TARGET_NATIVE
-D _USE_MATH_DEFINES
-lmosquitto
-I./lib/Webots/include/c
-I./lib/Webots/include/cpp
-L./lib/Webots/lib/controller
-llibController
lib_deps =
HALInterfaces
ArduinoNative
BlueAndi/ArduinoNative @ ~0.2.0
BlueAndi/ArduinoNative @ ~0.2.1
HALSim
Webots
MainNative
Expand All @@ -135,13 +134,12 @@ webots_robot_serial_tx_channel = 1
platform = native @ ~1.2.1
build_flags =
-std=c++11
-D _USE_MATH_DEFINES
-D TARGET_NATIVE
-D UNIT_TEST
-D _USE_MATH_DEFINES
lib_deps =
HALInterfaces
ArduinoNative
BlueAndi/ArduinoNative @ ~0.2.0
BlueAndi/ArduinoNative @ ~0.2.1
HALTest
Utilities
bblanchon/ArduinoJson @ ^7.2.0
Expand Down

0 comments on commit 7aef35d

Please sign in to comment.