1 files changed, 9 insertions, 7 deletions
diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile
index 3552537ad..e690b7804 100644
--- a/demos/Win32-MinGW/Makefile
+++ b/demos/Win32-MinGW/Makefile
@@ -57,24 +57,26 @@ UADEFS =
 
 # Imported source files
 CHIBIOS = ../..
+include ${CHIBIOS}/os/hal/hal.mk
+include ${CHIBIOS}/os/hal/platforms/Win32/platform.mk
+include ${CHIBIOS}/os/ports/GCC/SIMIA32/port.mk
 include ${CHIBIOS}/os/kernel/kernel.mk
 include ${CHIBIOS}/test/test.mk
 
 # List C source files here
-SRC  = ${KERNSRC} \
+SRC  = ${PORTSRC} \
+       ${KERNSRC} \
        ${TESTSRC} \
-       chcore.c \
-       ${CHIBIOS}/os/io/serial.c \
-       ${CHIBIOS}/os/io/platforms/Win32/serial_lld.c \
+       ${HALSRC} \
+       ${PLATFORMSRC} \
        main.c
 
 # List ASM source files here
 ASRC =
 
 # List all user directories here
-UINCDIR = $(KERNINC) $(TESTINC) \
-          ${CHIBIOS}/os/io \
-          ${CHIBIOS}/os/io/platforms/Win32
+UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
+          ${CHIBIOS}/os/various
 
 # List the user directory to look for the libraries here
 ULIBDIR =