Better detect arm/rPi, added Table_Mark_Estes demo.

marcmerlin · marcmerlin · commit 952bb9571622 · 2020-01-20T18:03:47.000Z
diff --git a/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos b/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos
@@ -1 +1 @@
-Subproject commit a54a6ba58ee62fa321b5662a00fb44a68d931b0d
+Subproject commit 022257656e2f1beabe327e88bb96747c0fc955f9
diff --git a/examples/GFX_Table_Mark_Estes/Makefile b/examples/GFX_Table_Mark_Estes/Makefile
@@ -0,0 +1 @@
+../Makefile
diff --git a/examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino b/examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/LEDMatrix/Table_Mark_Estes/Table_Mark_Estes.ino
diff --git a/examples/GFX_Table_Mark_Estes/neomatrix_config.h b/examples/GFX_Table_Mark_Estes/neomatrix_config.h
@@ -0,0 +1 @@
+../neomatrix_config.h
diff --git a/makeNativeArduino.mk b/makeNativeArduino.mk
@@ -29,7 +29,7 @@ LDFLAGS += -L/usr/X11R6/lib -lX11  # include X11 library
 LDFLAGS += -pthread                # include linux thread library
 # comment this out if you arne't using https://github.com/hzeller/rpi-rgb-led-matrix/
 
-ifneq ($(shell uname -m),x86_64)
+ifneq ($(shell uname -m |grep arm),)
 #pragma message "ARDUINOONPC building on ARM (guessing rPi), will link against rgbmatrix"
 LDFLAGS += -L$(NATIVE_ROOT)/rpi-rgb-led-matrix/lib -lrgbmatrix -lrt
 else

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/LEDMatrix/Table_Mark_Estes/Table_Mark_Estes.ino`