Skip to content

Commit 7ea3a66

Browse files
committed
Compile OSX
1 parent 61bcfad commit 7ea3a66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+64
-88
lines changed

ArduinoCore-API/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ tar --exclude='*.git*' -cjhvf $yourcore-$version.tar.bz2 $yourcore/
3131

3232
### Arduino Emulator
3333

34-
I used a copy of V1.2.0 from https://github.com/arduino/ArduinoCore-API. Unfortunatly I could not use this project as a git submodule because the String.h class is causing that the compilation is failing on non case sentsitive file systems - so I had to rename String.h and String.cpp to WString.h and WString.cpp!
34+
I used a copy of V1.2.0 from https://github.com/arduino/ArduinoCore-API. Unfortunatly I could not use this project as a git submodule because the WString.h class is causing that the compilation is failing on non case sentsitive file systems - so I had to rename WString.h and String.cpp to WWString.h and WString.cpp!
3535

ArduinoCore-API/api/ArduinoAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "Printable.h"
3333
#include "PluggableUSB.h"
3434
#include "Server.h"
35-
#include "String.h"
35+
#include "WString.h"
3636
#include "Stream.h"
3737
#include "Udp.h"
3838
#include "USBAPI.h"

ArduinoCore-API/api/IPAddress.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <stdint.h>
2323
#include "Printable.h"
24-
#include "String.h"
24+
#include "WString.h"
2525

2626
#define IPADDRESS_V4_BYTES_INDEX 12
2727
#define IPADDRESS_V4_DWORD_INDEX 3

ArduinoCore-API/api/Print.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <inttypes.h>
2323
#include <stdio.h> // for size_t
2424

25-
#include "String.h"
25+
#include "WString.h"
2626
#include "Printable.h"
2727

2828
#define DEC 10

ArduinoCore-API/api/String.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
#include "String.h"
22+
#include "WString.h"
2323
#include "Common.h"
2424
#include "itoa.h"
2525
#include "deprecated-avr-comp/avr/dtostrf.h"
File renamed without changes.

ArduinoCore-API/api/deprecated/WString.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

ArduinoCore-API/test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ set(TEST_TARGET_SRCS
139139
##########################################################################
140140

141141
add_compile_definitions(HOST)
142-
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
143-
add_compile_options(-Wno-cast-function-type)
142+
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wno-self-move)
143+
#add_compile_options(-Wno-cast-function-type)
144144

145145
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
146146
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -Wno-deprecated-copy")

ArduinoCore-API/test/src/IPAddress/test_fromString.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <catch2/catch_test_macros.hpp>
1212

13-
#include <api/String.h>
13+
#include <api/WString.h>
1414
#include <api/IPAddress.h>
1515

1616
/**************************************************************************************

ArduinoCore-API/test/src/IPAddress/test_fromString6.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <catch2/catch_test_macros.hpp>
1212

13-
#include <api/String.h>
13+
#include <api/WString.h>
1414
#include <api/IPAddress.h>
1515

1616
/**************************************************************************************

0 commit comments

Comments
 (0)