[util] Rename mount.c to winvblk.c
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Fri, 31 Dec 2010 21:48:37 +0000 (16:48 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Fri, 31 Dec 2010 21:48:37 +0000 (16:48 -0500)
It's a bit more than just a mounting utility, perhaps.

Makefile
WinVBlock.dev
makeutils.bat
src/util/winvblk.c [moved from src/util/mount.c with 100% similarity]

index fa1378e..522330f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,15 +49,15 @@ bin/loader32.exe: src/loader/obj/loader32.o Makefile
        gcc $(INCLUDES) -Wall src/loader/obj/loader32.o -o bin/loader32.exe -lsetupapi
        strip bin/loader32.exe
 
-src/util/obj/mount.o: src/util/mount.c src/portable.h src/mount.h Makefile
+src/util/obj/winvblk.o: src/util/winvblk.c src/portable.h src/mount.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/util/obj/mount.o bin/aoe.exe
-       gcc -Wall -c src/util/mount.c -o src/util/obj/mount.o
+       @rm -rf src/util/obj/winvblk.o bin/aoe.exe
+       gcc -Wall -c src/util/winvblk.c -o src/util/obj/winvblk.o
 
-bin/aoe.exe: src/util/obj/mount.o Makefile
+bin/aoe.exe: src/util/obj/winvblk.o Makefile
        @mkdir -p bin
        @rm -rf bin/aoe.exe
-       gcc -Wall src/util/obj/mount.o -o bin/aoe.exe
+       gcc -Wall src/util/obj/winvblk.o -o bin/aoe.exe
        strip bin/aoe.exe
 
 src/obj/driver.o: src/driver.c src/portable.h src/driver.h Makefile
index a768eab..e7c6c0c 100644 (file)
@@ -263,30 +263,20 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit43]\r
-FileName=src\util\mount.c\r
-Folder=Util\r
-Compile=1\r
-Link=1\r
-Priority=1000\r
-OverrideBuildCmd=0\r
-BuildCmd=\r
-CompileCpp=1\r
-\r
 [Unit44]\r
-FileName=src\aoe\aoe.rc\r
+FileName=src\include\device.h\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=Include\r
 Compile=1\r
-Link=0\r
+Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit45]\r
-FileName=src\include\device.h\r
+FileName=src\winvblock\device.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -294,9 +284,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit46]\r
-FileName=src\winvblock\device.c\r
+FileName=src\winvblock\filedisk\filedisk.c\r
 CompileCpp=1\r
-Folder=WinVBlock\r
+Folder=WinVBlock/FileDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -304,7 +294,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit47]\r
-FileName=src\winvblock\filedisk\filedisk.c\r
+FileName=src\winvblock\filedisk\grub4dos.c\r
 Folder=WinVBlock/FileDisk\r
 Compile=1\r
 Link=1\r
@@ -314,9 +304,9 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit48]\r
-FileName=src\winvblock\filedisk\grub4dos.c\r
+FileName=src\include\byte.h\r
 CompileCpp=1\r
-Folder=WinVBlock/FileDisk\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -324,7 +314,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit49]\r
-FileName=src\include\byte.h\r
+FileName=src\include\msvhd.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -334,29 +324,29 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit50]\r
-FileName=src\include\msvhd.h\r
+FileName=src\util\winvblock.rc\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=Util\r
 Compile=1\r
-Link=1\r
+Link=0\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit51]\r
-FileName=src\util\winvblock.rc\r
-Folder=Util\r
+FileName=src\include\wv_stdlib.h\r
+Folder=Include\r
 Compile=1\r
-Link=0\r
+Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 CompileCpp=1\r
 \r
 [Unit52]\r
-FileName=src\include\wv_stdlib.h\r
+FileName=src\winvblock\wv_stdlib.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -532,8 +522,8 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit53]\r
-FileName=src\winvblock\wv_stdlib.c\r
-Folder=WinVBlock\r
+FileName=src\include\wv_stddef.h\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -542,9 +532,9 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit54]\r
-FileName=src\include\wv_stddef.h\r
+FileName=src\aoe\wv_stdlib.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=AoE\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -552,9 +542,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit55]\r
-FileName=src\aoe\wv_stdlib.c\r
+FileName=src\include\wv_string.h\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -562,9 +552,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit56]\r
-FileName=src\include\wv_string.h\r
+FileName=src\winvblock\wv_string.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -572,9 +562,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit57]\r
-FileName=src\winvblock\wv_string.c\r
+FileName=src\include\wv_stdbool.h\r
 CompileCpp=1\r
-Folder=WinVBlock\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -582,9 +572,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit58]\r
-FileName=src\include\wv_stdbool.h\r
+FileName=src\aoe\wv_string.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=AoE\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -592,7 +582,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit59]\r
-FileName=src\aoe\wv_string.c\r
+FileName=src\aoe\bus.c\r
 Folder=AoE\r
 Compile=1\r
 Link=1\r
@@ -602,9 +592,9 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit61]\r
-FileName=src\aoe\registry.c\r
+FileName=src\util\winvblk.c\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=Util\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -612,7 +602,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit60]\r
-FileName=src\aoe\bus.c\r
+FileName=src\aoe\registry.c\r
 CompileCpp=1\r
 Folder=AoE\r
 Compile=1\r
@@ -771,3 +761,12 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
+[Unit43]\r
+FileName=src\aoe\aoe.rc\r
+Folder=AoE\r
+Compile=1\r
+Link=0\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
index 652a132..a7d9cde 100644 (file)
@@ -13,8 +13,8 @@ popd
 pushd .\r
 cd util\r
 rc winvblock.rc\r
-cl /I%CRT_INC_PATH% /I..\include /DWIN32_LEAN_AND_MEAN mount.c winvblock.res /Fe..\..\bin\winvblk.exe /link /LIBPATH:%DDK_LIB_DEST%\i386 /LIBPATH:%Lib%\crt\i386 bufferoverflowU.lib\r
-del mount.obj\r
+cl /I%CRT_INC_PATH% /I..\include /DWIN32_LEAN_AND_MEAN winvblk.c winvblock.res /Fe..\..\bin\winvblk.exe /link /LIBPATH:%DDK_LIB_DEST%\i386 /LIBPATH:%Lib%\crt\i386 bufferoverflowU.lib\r
+del winvblk.obj\r
 popd\r
 \r
 pushd .\r
similarity index 100%
rename from src/util/mount.c
rename to src/util/winvblk.c