mv sdl2 demo to src/ppusim folder

6 files changed, 6 insertions, 26 deletions

diff --git a/src/ds.mk b/src/ds.mk
index 57b305f..498ed27 100644
--- a/src/ds.mk
+++ b/src/ds.mk
@@ -1,2 +1,7 @@
 CC := gcc
 LD := gcc
+
+LFLAGS += -lSDL2
+
+DESKTOP_SRCS += ppusim/main.c
+
diff --git a/src/makefile b/src/makefile
index 6077824..f433385 100644
--- a/src/makefile
+++ b/src/makefile
@@ -33,6 +33,7 @@ AFLAGS += $(SHARED_FLAGS)
 
 SRCS += $(LOCAL_SRCS)
 SRCS += $(if $(STM), $(STM_SRCS), )
+SRCS += $(if $(DESKTOP), $(DESKTOP_SRCS), )
 
 ifeq ($(PLATFORM),stm)
 OBJS := $(patsubst %.c,%-stm.o, $(patsubst %.s,%-stm.o, $(SRCS)))
diff --git a/test/sdl2/main.c b/src/ppusim/sim.c
index beddc3f..beddc3f 100644
--- a/test/sdl2/main.c
+++ b/src/ppusim/sim.c
diff --git a/test/sdl2/.gitignore b/test/sdl2/.gitignore
deleted file mode 100644
index f0c9b81..0000000
--- a/test/sdl2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-main
diff --git a/test/sdl2/makefile b/test/sdl2/makefile
deleted file mode 100644
index 4c26dc3..0000000
--- a/test/sdl2/makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CC = gcc
-LD = gcc
-RM = rm -f
-TARGET = main
-LFLAGS += -lSDL2 -lm
-OBJS += main.o
-
-all: $(TARGET)
-
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-
-$(TARGET): $(OBJS)
-	$(LD) $^ $(LFLAGS) -o $@
-
-clean:
-	$(RM) $(TARGET) $(OBJS)
-
diff --git a/test/sdl2/readme.md b/test/sdl2/readme.md
deleted file mode 100644
index 940e315..0000000
--- a/test/sdl2/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# sdl2 test
-
-this is a simple POC that makes a window to draw PPU graphics to using SDL2.
-this code will be moved to the stm32/ppu directory, and the stm32's makefile
-will be edited to include a sim target for building the game for desktop
-debugging.