From 50946018e8bcf26ad8a2541a3584c7ae7d5d32e7 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 25 Nov 2016 15:37:56 -0600 Subject: [PATCH] wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack at code wwwwwwwwwwwwwwwwwww wwwww i think zcroll16 and scroll16 should be merged wwwwww --- makefile | 2 +- src/16.h | 3 +-- {16 => src/lib}/zcroll16.c | 0 {16 => src/lib}/zcroll16.h | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename {16 => src/lib}/zcroll16.c (100%) rename {16 => src/lib}/zcroll16.h (100%) diff --git a/makefile b/makefile index cf5e8b19..2d46a27c 100755 --- a/makefile +++ b/makefile @@ -160,9 +160,9 @@ TESTEXEC = & exmmtest.exe & vgmtest.exe & scroll.exe & + zcroll.exe & vrstest.exe TESTEXEC2 = & - zcroll.exe & inputest.exe & maptest.exe & fmemtest.exe & diff --git a/src/16.h b/src/16.h index 958a8e39..a50fcb5e 100755 --- a/src/16.h +++ b/src/16.h @@ -27,8 +27,7 @@ #include "src/lib/16_in.h" #include "src/lib/16_vl.h" #include "src/lib/wcpu/wcpu.h" -//#include "src/lib/planar.h" -#include "src/lib/scroll16.h" +//++++#include "src/lib/scroll16.h" #include "src/lib/16_timer.h" #include "src/lib/16_dbg.h" diff --git a/16/zcroll16.c b/src/lib/zcroll16.c similarity index 100% rename from 16/zcroll16.c rename to src/lib/zcroll16.c diff --git a/16/zcroll16.h b/src/lib/zcroll16.h similarity index 100% rename from 16/zcroll16.h rename to src/lib/zcroll16.h -- 2.39.5