clean up.

diff --git a/Makefile b/Makefile
index 014067b..202e2af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-DIRS=libs emulator display
+DIRS=libs emulator/ppucore emulator display
 
 ROOT_DIR=$(CURDIR)
        

diff --git a/emulator/Makefile b/emulator/Makefile
index a30019e..11a1737 100644 (file)
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -17,9 +17,12 @@ CFLAGS=-g $(INCLUDE) -Wall
 
 all:   $(BIN)
 
-$(BIN): $(OBJS) ../libs ./ppucore
+$(BIN): $(OBJS) ../libs ppucore/libppucore.a
        gcc -o $(BIN) $(OBJS) $(LIBS)
 
+ppucore/libppucore.a:
+       make -C ppucore
+
 .c.o: 
        gcc $(CFLAGS) -c $<
 

diff --git a/emulator/ppu.c b/emulator/ppu.c
index 2eaf2b4..5f8f91b 100644 (file)
--- a/emulator/ppu.c
+++ b/emulator/ppu.c
@@ -8,6 +8,8 @@
 #include "clock.h"
 #include "tools.h"
 
+int ppucore_init(void);
+
 struct ppu_cpu_pin {
     unsigned int ce     :1;     /*chip enable*/
     unsigned int rw     :1;     /*assert on write.*/