bat files. again.

joncampbell123 · Jul 12, 2014 · 8327f81 · 8327f81
1 parent 688aacf
commit 8327f81
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 19 deletions.
diff --git a/hw/8254/CLEAN.BAT b/hw/8254/CLEAN.BAT
@@ -1,9 +1,6 @@
 @echo off
 
 deltree /Y 
-<<<<<<< HEAD
-del /s /q win38631\*.*
-=======
 del /s /q dos86c\*.*
 deltree /Y 
 del /s /q dos86l\*.*
@@ -13,7 +10,6 @@ deltree /Y
 del /s /q dos86s\*.*
 deltree /Y 
 del /s /q dos386f\*.*
->>>>>>> 0fcdf9b2f23b51b833bbc0038be81e65152f0d38
 del *.obj
 del *.exe
 del *.lib

diff --git a/hw/8254/MAKE.BAT b/hw/8254/MAKE.BAT
@@ -7,10 +7,6 @@ set DOS4G=quiet
 if "%1" == "clean" call clean.bat
 if "%1" == "clean" goto end
 
-<<<<<<< HEAD
-mkdir win38631
-wmake -f ..\..\mak\win38631.mak HPS=\ lib REL=..\.. 
-=======
 mkdir dos86c
 wmake -f ..\..\mak\dos86c.mak HPS=\ all REL=..\.. 
 
@@ -25,7 +21,6 @@ wmake -f ..\..\mak\dos86s.mak HPS=\ all REL=..\..
 
 mkdir dos386f
 wmake -f ..\..\mak\dos386f.mak HPS=\ all REL=..\.. 
->>>>>>> 0fcdf9b2f23b51b833bbc0038be81e65152f0d38
 
 
 :end
diff --git a/hw/ide/CLEAN.BAT b/hw/ide/CLEAN.BAT
@@ -1,2 +1,17 @@
 @echo off
 
+deltree /Y 
+del /s /q dos86c\*.*
+deltree /Y 
+del /s /q dos86l\*.*
+deltree /Y 
+del /s /q dos86m\*.*
+deltree /Y 
+del /s /q dos86s\*.*
+deltree /Y 
+del /s /q dos386f\*.*
+del *.obj
+del *.exe
+del *.lib
+del *.com
+del foo.gz
diff --git a/hw/ide/MAKE.BAT b/hw/ide/MAKE.BAT
@@ -7,3 +7,20 @@ set DOS4G=quiet
 if "%1" == "clean" call clean.bat
 if "%1" == "clean" goto end
 
+mkdir dos86c
+wmake -f ..\..\mak\dos86c.mak HPS=\ all REL=..\.. 
+
+mkdir dos86l
+wmake -f ..\..\mak\dos86l.mak HPS=\ all REL=..\.. 
+
+mkdir dos86m
+wmake -f ..\..\mak\dos86m.mak HPS=\ all REL=..\.. 
+
+mkdir dos86s
+wmake -f ..\..\mak\dos86s.mak HPS=\ all REL=..\.. 
+
+mkdir dos386f
+wmake -f ..\..\mak\dos386f.mak HPS=\ all REL=..\.. 
+
+
+:end
diff --git a/hw/pci/CLEAN.BAT b/hw/pci/CLEAN.BAT
@@ -2,6 +2,14 @@
 
 deltree /Y 
 del /s /q dos86c\*.*
+deltree /Y 
+del /s /q dos86l\*.*
+deltree /Y 
+del /s /q dos86m\*.*
+deltree /Y 
+del /s /q dos86s\*.*
+deltree /Y 
+del /s /q dos386f\*.*
 del *.obj
 del *.exe
 del *.lib

diff --git a/hw/pci/MAKE.BAT b/hw/pci/MAKE.BAT
@@ -8,7 +8,19 @@ if "%1" == "clean" call clean.bat
 if "%1" == "clean" goto end
 
 mkdir dos86c
-wmake -f ..\..\mak\dos86c.mak HPS=\ lib REL=..\.. 
+wmake -f ..\..\mak\dos86c.mak HPS=\ all REL=..\.. 
+
+mkdir dos86l
+wmake -f ..\..\mak\dos86l.mak HPS=\ all REL=..\.. 
+
+mkdir dos86m
+wmake -f ..\..\mak\dos86m.mak HPS=\ all REL=..\.. 
+
+mkdir dos86s
+wmake -f ..\..\mak\dos86s.mak HPS=\ all REL=..\.. 
+
+mkdir dos386f
+wmake -f ..\..\mak\dos386f.mak HPS=\ all REL=..\.. 
 
 
 :end
diff --git a/windows/ntvdm/CLEAN.BAT b/windows/ntvdm/CLEAN.BAT
@@ -1,9 +1,6 @@
 @echo off
 
 deltree /Y 
-<<<<<<< HEAD
-del /s /q win38631\*.*
-=======
 del /s /q dos86c\*.*
 deltree /Y 
 del /s /q dos86l\*.*
@@ -23,7 +20,6 @@ deltree /Y
 del /s /q winnt\*.*
 deltree /Y 
 del /s /q win32\*.*
->>>>>>> 0fcdf9b2f23b51b833bbc0038be81e65152f0d38
 del *.obj
 del *.exe
 del *.lib

diff --git a/windows/ntvdm/MAKE.BAT b/windows/ntvdm/MAKE.BAT
@@ -7,10 +7,6 @@ set DOS4G=quiet
 if "%1" == "clean" call clean.bat
 if "%1" == "clean" goto end
 
-<<<<<<< HEAD
-mkdir win38631
-wmake -f ..\..\mak\win38631.mak HPS=\ lib REL=..\.. 
-=======
 mkdir dos86c
 wmake -f ..\..\mak\dos86c.mak HPS=\ all REL=..\.. 
 
@@ -40,7 +36,6 @@ wmake -f ..\..\mak\winnt.mak HPS=\ all REL=..\..
 
 mkdir win32
 wmake -f ..\..\mak\win32.mak HPS=\ all REL=..\.. 
->>>>>>> 0fcdf9b2f23b51b833bbc0038be81e65152f0d38
 
 
 :end