]> 4ch.mooo.com Git - 16.git/commitdiff
wwww
authorsparky4 <sparky4@cock.li>
Mon, 21 Mar 2016 14:53:05 +0000 (09:53 -0500)
committersparky4 <sparky4@cock.li>
Mon, 21 Mar 2016 14:53:05 +0000 (09:53 -0500)
makefile
src/lib/doslib

index 8d1771e36f690622146e3f14e6ce3a2b0c760e94..24031e2a6551971888f3417998232a610e6cfe4d 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -90,8 +90,6 @@ TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
-!include $(DOSLIBDIR)/extdep.mak
-
 all: $(EXEC)
 
 #$(16LIBOBJS) => 16.lib bug....
@@ -481,17 +479,19 @@ updatelibs: .symbolic
        @cd $(PDIR)$(PDIR)$(PDIR)
        @cd $(DOSLIB)
        @git pull
+       !include $(DOSLIBDIR)/extdep.mak
        @./buildall.sh
        @cd $(PDIR)$(PDIR)$(PDIR)
 
 reinitlibs: .symbolic
        @rm -rf $(SRCLIB)doslib
        @rm -rf $(SRCLIB)jsmn
-       @mkdir $(SRCLIB)doslib
-       @mkdir $(SRCLIB)jsmn
+       #@mkdir $(SRCLIB)doslib
+       #@mkdir $(SRCLIB)jsmn
        @wmake -h initlibs
 
 initlibs: .symbolic
+       @cp git_modu.les .gitmodules
        @cd $(SRCLIB)
        @git clone https://github.com/joncampbell123/doslib.git
        @git clone https://github.com/zserge/jsmn.git
index ce3e74b0e79e54fe9d1bd9df813813bdf2f56bbb..d18873cfeb013751b3f9dacbf942c8efbfa299a5 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ce3e74b0e79e54fe9d1bd9df813813bdf2f56bbb
+Subproject commit d18873cfeb013751b3f9dacbf942c8efbfa299a5