.

shorepine · May 25, 2024 · 523ff0c · 523ff0c
1 parent 9bf6286
commit 523ff0c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/tulip/README.md b/tulip/README.md
@@ -8,7 +8,7 @@ linux - all Tulip Desktop for Linux specific files
 macos - all Tulip Desktop for macOS specific files
 shared - code shared between all Tulip ports (hardware & Desktop)
 shared/py - Python modules that get loaded into Tulip
-shared_desktop - code shared between Tulip Desktop ports (macOS, iOS, Linux)
+shared/desktop - code shared between Tulip Desktop ports (macOS, iOS, Linux)
 ```
 
 
diff --git a/tulip/ios/Makefile b/tulip/ios/Makefile
@@ -39,7 +39,7 @@ include $(TOP)/extmod/extmod.mk
 INC +=  -I.
 INC +=  -I$(TOP)
 INC += -I$(BUILD)
-INC += -I../shared_desktop/
+INC += -I../shared/desktop/
 INC += -I$(TOP)/ports/unix
 INC += -I../shared/
 INC += -I../../amy/src/
@@ -189,10 +189,10 @@ endif
 # source files
 SRC_C += \
 	main.c \
-	../shared_desktop/unix_mphal.c \
-	../shared_desktop/unix_display.c \
-	../shared_desktop/multicast.c \
-	../shared_desktop/mpthreadport.c \
+	../shared/desktop/unix_mphal.c \
+	../shared/desktop/unix_display.c \
+	../shared/desktop/multicast.c \
+	../shared/desktop/mpthreadport.c \
 	$(MICROPY_PORT_DIR)/gccollect.c \
 	$(MICROPY_PORT_DIR)/input.c \
 	$(MICROPY_PORT_DIR)/modmachine.c \

diff --git a/tulip/linux/Makefile b/tulip/linux/Makefile
@@ -10,7 +10,7 @@ TOP = ../../micropython
 VARIANT_DIR ?= ../../micropython/ports/unix/variants/$(VARIANT)
 
 include $(TOP)/py/mkenv.mk
-include ../shared_desktop/mpconfigport.mk
+include ../shared/desktop/mpconfigport.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
 
 # Use the default frozen manifest, variants may override this.
@@ -35,7 +35,7 @@ include $(TOP)/extmod/extmod.mk
 INC +=  -I.
 INC +=  -I$(TOP)
 INC += -I$(BUILD)
-INC += -I../shared_desktop/
+INC += -I../shared/desktop/
 INC += -I$(TOP)/ports/unix
 INC += -I../shared/
 INC += -I../../amy/src/
@@ -170,10 +170,10 @@ endif
 # source files
 SRC_C += \
 	main.c \
-	../shared_desktop/unix_mphal.c \
-	../shared_desktop/unix_display.c \
-	../shared_desktop/multicast.c \
-	../shared_desktop/mpthreadport.c \
+	../shared/desktop/unix_mphal.c \
+	../shared/desktop/unix_display.c \
+	../shared/desktop/multicast.c \
+	../shared/desktop/mpthreadport.c \
 	../../amy/src/libminiaudio-audio.c \
 	$(MICROPY_PORT_DIR)/gccollect.c \
 	$(MICROPY_PORT_DIR)/input.c \

diff --git a/tulip/macos/Makefile b/tulip/macos/Makefile
@@ -32,7 +32,7 @@ TOP = ../../micropython
 VARIANT_DIR ?= ../../micropython/ports/unix/variants/$(VARIANT)
 
 include $(TOP)/py/mkenv.mk
-include ../shared_desktop/mpconfigport.mk
+include ../shared/desktop/mpconfigport.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
 
 # Use the default frozen manifest, variants may override this.
@@ -78,7 +78,7 @@ $(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/gen_mpy.py
 INC +=  -I.
 INC +=  -I$(TOP)
 INC += -I$(BUILD)
-INC += -I../shared_desktop/
+INC += -I../shared/desktop/
 INC += -I$(TOP)/ports/unix
 INC += -I../shared/
 INC += -I../../amy/src/
@@ -233,10 +233,10 @@ endif
 # source files
 SRC_C += \
 	main.c \
-	../shared_desktop/unix_mphal.c \
-	../shared_desktop/unix_display.c \
-	../shared_desktop/multicast.c \
-	../shared_desktop/mpthreadport.c \
+	../shared/desktop/unix_mphal.c \
+	../shared/desktop/unix_display.c \
+	../shared/desktop/multicast.c \
+	../shared/desktop/mpthreadport.c \
 	../../amy/src/libminiaudio-audio.c \
 	$(MICROPY_PORT_DIR)/gccollect.c \
 	$(MICROPY_PORT_DIR)/input.c \

diff --git a/tulip/shared_desktop/mpconfigport.h → tulip/shared/desktop/mpconfigport.h b/tulip/shared_desktop/mpconfigport.h → tulip/shared/desktop/mpconfigport.h
diff --git a/tulip/shared_desktop/mpconfigport.mk → tulip/shared/desktop/mpconfigport.mk b/tulip/shared_desktop/mpconfigport.mk → tulip/shared/desktop/mpconfigport.mk
diff --git a/tulip/shared_desktop/mphalport.h → tulip/shared/desktop/mphalport.h b/tulip/shared_desktop/mphalport.h → tulip/shared/desktop/mphalport.h
diff --git a/tulip/shared_desktop/mpthreadport.c → tulip/shared/desktop/mpthreadport.c b/tulip/shared_desktop/mpthreadport.c → tulip/shared/desktop/mpthreadport.c
diff --git a/tulip/shared_desktop/mpthreadport.h → tulip/shared/desktop/mpthreadport.h b/tulip/shared_desktop/mpthreadport.h → tulip/shared/desktop/mpthreadport.h
diff --git a/tulip/shared_desktop/multicast.c → tulip/shared/desktop/multicast.c b/tulip/shared_desktop/multicast.c → tulip/shared/desktop/multicast.c
diff --git a/tulip/shared_desktop/unix_display.c → tulip/shared/desktop/unix_display.c b/tulip/shared_desktop/unix_display.c → tulip/shared/desktop/unix_display.c
diff --git a/tulip/shared_desktop/unix_mphal.c → tulip/shared/desktop/unix_mphal.c b/tulip/shared_desktop/unix_mphal.c → tulip/shared/desktop/unix_mphal.c