Merge pull request #6 from aczid/esp32

Added support for compiling micropython on Linux with SDL-backed ugfx

esp32/modugfx.c

@@ -34,7 +34,10 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#ifndef UNIX
 #include "board_framebuffer.h"
+#endif
+
 #include "gfx.h"
 #include "gfxconf.h"
 
@@ -381,8 +384,8 @@ STATIC mp_obj_t ugfx_polygon(mp_uint_t n_args, const mp_obj_t *args) {
 
   mp_obj_t *mp_arr;
   mp_obj_t *mp_arr2;
-  uint len;
-  uint len2;
+  size_t len;
+  size_t len2;
   mp_obj_get_array(args[2], &len, &mp_arr);
 
   if (len <= 20) {
@@ -419,8 +422,8 @@ STATIC mp_obj_t ugfx_fill_polygon(mp_uint_t n_args, const mp_obj_t *args) {
 
   mp_obj_t *mp_arr;
   mp_obj_t *mp_arr2;
-  uint len;
-  uint len2;
+  size_t len;
+  size_t len2;
   mp_obj_get_array(args[2], &len, &mp_arr);
 
   if (len <= 20) {

unix/Makefile

@@ -19,6 +19,12 @@ include ../py/py.mk
 INC +=  -I.
 INC +=  -I..
 INC += -I$(BUILD)
+INC += -I../../components/ugfx
+INC += -I../../ugfx/src/gdisp/mcufont
+INC += -I../../ugfx
+INC += -I../esp32
+INC += -I../../ugfx/src
+INC += -I../../ugfx/drivers/multiple/SDL/
 
 # compiler settings
 CWARN = -Wall -Werror
@@ -142,6 +148,9 @@ SRC_C = \
 	input.c \
 	file.c \
 	modmachine.c \
+	../esp32/modugfx.c \
+	../../ugfx/drivers/multiple/SDL/gdisp_lld_SDL.c \
+	gfx_mk.c \
 	modos.c \
 	moduos_vfs.c \
 	modtime.c \
@@ -151,6 +160,20 @@ SRC_C = \
 	fatfs_port.c \
 	$(SRC_MOD)
 
+OPT_GFXDRIVER           = SDL
+OPT_OS					= linux
+OPT_LINK_OPTIMIZE		= yes
+OPT_CPU					= x64
+GFXLIB                  = ../../ugfx/
+
+include $(GFXLIB)/boards/base/Linux-SDL/board.mk
+include $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk
+include $(GFXLIB)/tools/gmake_scripts/os_$(OPT_OS).mk
+
+# expand all the uGFX definitions from DEFS into CPP defines
+SRCFLAGS += -I. $(patsubst %,-I%,$(INCPATH)) $(patsubst %,-D%,$(patsubst -D%,%,$(DEFS)))
+CFLAGS += $(SRCFLAGS)
+
 LIB_SRC_C = $(addprefix lib/,\
 	$(LIB_SRC_C_EXTRA) \
 	timeutils/timeutils.c \

unix/README.md

@@ -0,0 +1,17 @@
+get all the submodules for micropython if you haven't already
+
+    cd micropython
+
+    git submodule update --init --recursive
+
+Satisfy axtls generating its version.h
+
+    cd lib/axtls
+    make menuconfig
+
+Build axtls and the binary
+
+    cd unix
+    make axtls
+    make
+

unix/gfx_mk.c

@@ -0,0 +1,21 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#include "gfx.c"
+#include "gos/gos_mk.c"
+#include "gdriver/gdriver_mk.c"
+#include "gqueue/gqueue_mk.c"
+#include "gdisp/gdisp_mk.c"
+#include "gevent/gevent_mk.c"
+#include "gtimer/gtimer_mk.c"
+#include "gwin/gwin_mk.c"
+#include "ginput/ginput_mk.c"
+#include "gadc/gadc_mk.c"
+#include "gaudio/gaudio_mk.c"
+#include "gmisc/gmisc_mk.c"
+#include "gfile/gfile_mk.c"
+#include "gtrans/gtrans_mk.c"