Commit MetaInfo

Revision54460b8770fffd34cf39929bb4c718175e9317c8 (tree)
Time2019-05-09 01:33:01
Authorsparky4 <sparky4@cock...>
Commitersparky4

Log Message

fixed the issue with compiling in dos in 1.9 and 2.0. only 1.9 linux fails for some reason

Change Summary

Incremental Difference

Binary files /dev/null and b/JOYTEST.E differ
--- a/WBUILD.BAT
+++ b/WBUILD.BAT
@@ -3,7 +3,6 @@ set pee="-h"
33 rem -s"
44 wmake -h -s clean
55 wmake %pee
6-rem TODO ADD ME LATER ++
76 wmake %pee comp
87 if exist *.err (wmake %pee vomitchan)
98 rem if exist *.o (del *.o)
Binary files a/bcexmm.exe and /dev/null differ
--- a/makefile
+++ b/makefile
@@ -59,8 +59,8 @@ MOVECOMMAND=move
5959 DIRSEP=\
6060 OBJ=obj
6161 DUMP=type
62-DOSLIBMAKE=.\make.bat
63-DOSLIBMAKEALL=.\build.bat
62+DOSLIBMAKE=make.bat build all
63+DOSLIBMAKEALL=buildall.bat build all
6464 !endif
6565
6666 TARGET_OS = dos
@@ -71,9 +71,9 @@ BUILD_ROOT=$+$(%__CWD__)$-
7171 DATADIR=data/
7272 SPRI=$(DATADIR)/spri
7373 SRC=src
74-UTIL=$(SRC)/util
74+UTIL=$(SRC)$(DIRSEP)util
7575 GITCONFIGDIR=$(UTIL)/git
76-SCRIPTBATDIR=$(UTIL)/shbat
76+SCRIPTBATDIR=$(UTIL)$(DIRSEP)shbat
7777 SRCLIB=$(SRC)/lib
7878 JSMNLIB=$(SRCLIB)/jsmn
7979 NYANLIB=$(SRCLIB)/nyan
@@ -250,11 +250,13 @@ EXEC = &
250250 16.exe &
251251 bakapi.exe &
252252 $(TESTEXEC) &
253- $(UTILEXEC)
253+ $(UTILEXEC) &
254+ $(DOSLIBTESTEXEC)
254255
255-#!ifdef __LINUX__
256-#EXEC += $(SPRIUTILEXEC)
257-#!endif
256+!ifdef __LINUX__
257+#++?EXEC += $(SPRIUTILEXEC)
258+#EXEC += $(DOSLIBTESTEXEC)
259+!endif
258260
259261 ALLEXEC = &
260262 $(EXEC) &
@@ -493,6 +495,7 @@ clean: .symbolic
493495 @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
494496 @wmake -s -h initscript
495497 @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
498+ @wmake -s -h exe2e
496499 !ifdef __LINUX__
497500 @if exist *.LIB $(REMOVECOMMAND) *.LIB
498501 @. src/util/bcexmm.sh
@@ -552,31 +555,42 @@ initconfig: .symbolic
552555
553556 backupscript: .symbolic
554557 @$(COPYCOMMAND) WBUILD.BAT WBUILD.B
555- @$(COPYCOMMAND) wbuild.sh wbuild.s
556558 @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
557- @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
558559 @$(MOVECOMMAND) WBUILD.B WBUILD.BAT
559- @$(MOVECOMMAND) wbuild.s wbuild.sh
560+
560561 !ifdef __LINUX__
562+ @$(COPYCOMMAND) wbuild.sh wbuild.s
563+ @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
564+ @$(MOVECOMMAND) wbuild.s wbuild.sh
565+
561566 @if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
562- @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
567+ @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh .
563568 !endif
564- @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
565- @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
569+ @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh .
570+ @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT .
566571
567572 initscript: .symbolic
568- @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
569- @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
573+ @$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.bat .
570574 !ifdef __LINUX__
571- @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
575+ @$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.sh .
576+ @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT .
572577 !endif
573578
574579
575580 comp: .symbolic
576- @*upx -9 $(EXEC)
581+ @*upx -9 *.exe#$(EXEC)
582+ @wmake -s -h e2exe
577583
578584 comq: .symbolic
579- @*upx -9 $(UPXQ) $(EXEC)
585+ @*upx -9 $(UPXQ) *.exe#$(EXEC)
586+ @wmake -s -h e2exe
587+
588+exe2e: .symbolic
589+ @if exist *.exe $(MOVECOMMAND) *.exe *.e
590+ #@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
591+
592+e2exe: .symbolic
593+ @if exist *.e $(MOVECOMMAND) *.e *.exe
580594
581595 www: .symbolic
582596 @if exist 16.exe @wmake -s -h wwwdo
Binary files a/palllist.exe and /dev/null differ
Binary files a/sdtest.exe and /dev/null differ
--- a/src/util/shbat/WBUILD.BAT
+++ b/src/util/shbat/WBUILD.BAT
@@ -3,7 +3,6 @@ set pee="-h"
33 rem -s"
44 wmake -h -s clean
55 wmake %pee
6-rem TODO ADD ME LATER ++
76 wmake %pee comp
87 if exist *.err (wmake %pee vomitchan)
98 rem if exist *.o (del *.o)
Show on old repository browser