fix bootsector compilation in VS

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-02-28 11:14:12 +03:00
parent 32ec9183d5
commit 3fdc507aff
3 changed files with 8 additions and 9 deletions

View File

@ -2,11 +2,11 @@
!error Variable DESTDIR must be defined!
!endif
!ifdef NASM_PREFIX
NASM=$(NASM_PREFIX)nasm
!else
# !ifdef NASM_PREFIX
# NASM=$(NASM_PREFIX)\nasm
# !else
NASM=nasm
!endif
# !endif
all: boot0 boot0af boot0ss boot0md boot1h boot1h2 boot1f32 boot1f32alt boot1x boot1xalt

View File

@ -1224,7 +1224,7 @@ FindStartupDiskVolume (
//
DiskVolume = NULL;
DBG (" - searching for that disk\n");
for (UINTN Index = 0; Index < Volumes.size(); ++Index) {
for (Index = 0; Index < (INTN)Volumes.size(); ++Index) {
Volume = &Volumes[Index];
if (BootVolumeDevicePathEqual (gEfiBootVolume, Volume->DevicePath)) {
// that's the one

View File

@ -82,10 +82,6 @@ extern "C" {
}
#endif
#include "../cpp_foundation/XStringW.h"
#include "../cpp_foundation/XArray.h"
#include "../cpp_foundation/XObjArray.h"
#include "../refit/lib.h"
#include "string.h"
#include "boot.h"
@ -102,6 +98,9 @@ extern "C" {
#define PCAT_RTC_DATA_REGISTER 0x71
#ifdef __cplusplus
#include "../cpp_foundation/XStringW.h"
#include "../cpp_foundation/XArray.h"
#include "../cpp_foundation/XObjArray.h"
#include "../cpp_util/remove_ref.h"
#endif
#ifdef _MSC_VER