wwww

diff --git a/makefile b/makefile
index 385c8f54ba0c0c2be5b486e38ce878ac40678f31..c0a60de1e0a45d33a5635faf1221c9c793619446 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -236,16 +236,16 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c .symbolic
 #
 #non executable objects libraries
 #
-.C.LIB:
-       *wlib -b $(WLIBQ) $[@
+#.C.LIB:
+#      *wlib -b $(WLIBQ) $[@
 
-16.lib: $(16LIBOBJS) .symbolic# doslib.lib vgmsnd.lib
+16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
        *wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
 
-gfx.lib: $(GFXLIBOBJS) .symbolic
+gfx.lib: $(GFXLIBOBJS)
        *wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
 
-vgmsnd.lib: $(VGMSNDOBJ) .symbolic
+vgmsnd.lib: $(VGMSNDOBJ)
        *wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
 
 # extdep:
@@ -277,75 +277,80 @@ modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c .symbolic
        #*wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
 bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)bakapee.c
+       #*wcl $(FLAGS) -c $(SRCLIB)bakapee.c
 
-16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c .symbolic
-       *wcl $(FLAGS) -c $(MODEXLIB)16render.c
+16render.$(OBJ): $(SRCLIB)16render.h $(SRCLIB)16render.c .symbolic
+       #*wcl $(FLAGS) -c $(MODEXLIB)16render.c
 
 ##16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c
 ##     *wcl $(FLAGS) -c $(MODEXLIB)16planar.c
 
 16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c $(DOSLIBLIBS) .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
+       #*wcl $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
 16_sprit.$(OBJ): $(SRCLIB)16_sprit.h $(SRCLIB)16_sprit.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_sprit.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_sprit.c
 
 
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)bitmap.c
+       #*wcl $(FLAGS) -c $(SRCLIB)bitmap.c
 
 ##planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
 ##     *wcl $(FLAGS) -c $(SRCLIB)planar.c
 
 scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)scroll16.c
-
-wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c .symbolic
-       *wcl $(FLAGS) -c $(WCPULIB)wcpu.c
+       #*wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 
 16text.$(OBJ): $(SRCLIB)16text.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16text.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16text.c
 
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)mapread.c
+       #*wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
 16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_timer.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_timer.c
 
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_in.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_in.c
 
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_mm.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
 16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_ca.c
 
 16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
 
 midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)midi.c
+       #*wcl $(FLAGS) -c $(SRCLIB)midi.c
 
 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_head.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
 16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_hc.c
 
 16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c .symbolic
-       *wcl $(FLAGS) -c $(SRCLIB)16_snd.c
-       #====*wcl -mc -c $(SRCLIB)16_snd.c
+       #*wcl $(FLAGS) -c $(SRCLIB)16_snd.c
 
-jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c .symbolic
-       *wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
-kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c .symbolic
-       *wcl $(FLAGS) -c $(NYANLIB)kitten.c
+{$(JSMNLIB)}.C.$(OBJ):
+       *wcl $(FLAGS) -c $[@
+{$(NYANLIB)}.C.$(OBJ):
+       *wcl $(FLAGS) -c $[@
+{$(VGMSNDLIB)}.C.$(OBJ):
+       *wcl $(FLAGS) -c $[@
+{$(WCPULIB)}.C.$(OBJ):
+       *wcl $(FLAGS) -c $[@
 
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c .symbolic
+       #*wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
+kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c .symbolic
+       #*wcl $(FLAGS) -c $(NYANLIB)kitten.c
 vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c .symbolic
-       *wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
-       #====*wcl -c -mc $(VGMSNDLIB)vgmSnd.c
+       #*wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c .symbolic
+       #*wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
 #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 #      *wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c

diff --git a/src/lib/modex16/16render.c b/src/lib/16render.c
similarity index 96%
rename from src/lib/modex16/16render.c
rename to src/lib/16render.c
index 051e94f97cf73ea918d3c5bd7e581859ef97ac4e..091775b7ba1ce88a0bf82eb80e6805bd308943a3 100755 (executable)
--- a/src/lib/modex16/16render.c
+++ b/src/lib/16render.c
@@ -23,7 +23,7 @@
  * Render data code~\r
  */\r
 \r
-#include "src/lib/modex16/16render.h"\r
+#include "src/lib/16render.h"\r
 \r
 //TODO! ADD CLIPPING!!\r
 //memory management needs to be added\r

diff --git a/src/lib/modex16/16render.h b/src/lib/16render.h
similarity index 100%
rename from src/lib/modex16/16render.h
rename to src/lib/16render.h

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index a07121ab9f875f97c55e2812803fe31a7bcc938b..23202f2d50508828ebd4243f91a5b7b3096c59c6 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -30,7 +30,7 @@
 //#include "src/lib/planar.h"
 //#include "src/lib/modex16/16planar.h"
 #include "src/lib/16text.h"
-#include "src/lib/modex16/16render.h"
+#include "src/lib/16render.h"
 ////#include "src/lib/modex16/320x240.h"
 // #include "src/lib/modex16/320x200.h"
 // #include "src/lib/modex16/256x192.h"