mirror of
https://github.com/reactos/reactos.git
synced 2024-08-08 12:18:13 +00:00
- add linux path
- fix bug in getDefaultHDDImage - sysreg can now create the hdd image and start the emulator svn path=/trunk/; revision=28665
This commit is contained in:
parent
c8026e017e
commit
157fa523ae
|
@ -103,7 +103,11 @@ namespace Sysreg_
|
||||||
img = "output-i386";
|
img = "output-i386";
|
||||||
|
|
||||||
EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img);
|
EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img);
|
||||||
|
#ifdef __LINUX__
|
||||||
|
img += _T("/ros.hd");
|
||||||
|
#else
|
||||||
img += _T("\\ros.hd");
|
img += _T("\\ros.hd");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
//---------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------
|
||||||
bool RosBootTest::isFileExisting(string output)
|
bool RosBootTest::isFileExisting(string output)
|
||||||
|
@ -142,15 +146,17 @@ namespace Sysreg_
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __LINUX___
|
|
||||||
qemuimgdir += _T("\\qemu-img");
|
#ifdef __LINUX__
|
||||||
|
qemuimgdir += _T("/qemu-img");
|
||||||
|
|
||||||
#else
|
#else
|
||||||
qemuimgdir += _T("\\qemu-img.exe");
|
qemuimgdir += _T("\\qemu-img.exe");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!isFileExisting(qemuimgdir))
|
if (!isFileExisting(qemuimgdir))
|
||||||
{
|
{
|
||||||
cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img" << endl;
|
cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img " << qemuimgdir << endl;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -74,11 +74,13 @@ $(SYSREGBUILD_INT_)env_var.o: $(SYSREGBUILD_BASE_)env_var.cpp | $(SYSREGBUILD_IN
|
||||||
$(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT)
|
$(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT)
|
||||||
$(ECHO_CC)
|
$(ECHO_CC)
|
||||||
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
|
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
|
||||||
|
|
||||||
ifneq ($(HOST),mingw32-linux)
|
ifneq ($(HOST),mingw32-linux)
|
||||||
$(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT)
|
$(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT)
|
||||||
$(ECHO_CC)
|
$(ECHO_CC)
|
||||||
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
|
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT)
|
$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT)
|
||||||
$(ECHO_CC)
|
$(ECHO_CC)
|
||||||
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
|
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
|
||||||
|
|
|
@ -10,8 +10,8 @@ ROS_EMU_TYPE=qemu
|
||||||
;
|
;
|
||||||
; This variable sets the path to the emulator
|
; This variable sets the path to the emulator
|
||||||
;
|
;
|
||||||
ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
|
;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
|
||||||
|
ROS_EMU_PATH=/usr/bin/qemu
|
||||||
|
|
||||||
; ROS_HDD_IMAGE
|
; ROS_HDD_IMAGE
|
||||||
;
|
;
|
||||||
|
|
Loading…
Reference in a new issue