diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp index d6cf257c711..3a0625d2c0f 100644 --- a/reactos/tools/sysreg/rosboot_test.cpp +++ b/reactos/tools/sysreg/rosboot_test.cpp @@ -103,7 +103,11 @@ namespace Sysreg_ img = "output-i386"; EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img); +#ifdef __LINUX__ + img += _T("/ros.hd"); +#else img += _T("\\ros.hd"); +#endif } //--------------------------------------------------------------------------------------- bool RosBootTest::isFileExisting(string output) @@ -142,15 +146,17 @@ namespace Sysreg_ return false; } -#ifdef __LINUX___ - qemuimgdir += _T("\\qemu-img"); + +#ifdef __LINUX__ + qemuimgdir += _T("/qemu-img"); + #else qemuimgdir += _T("\\qemu-img.exe"); #endif 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; } diff --git a/reactos/tools/sysreg/sysreg.mak b/reactos/tools/sysreg/sysreg.mak index 3bbe2fd285b..20da4b28753 100644 --- a/reactos/tools/sysreg/sysreg.mak +++ b/reactos/tools/sysreg/sysreg.mak @@ -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) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + ifneq ($(HOST),mingw32-linux) $(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ endif + $(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ diff --git a/reactos/tools/sysreg/txtmode.cfg b/reactos/tools/sysreg/txtmode.cfg index 7e725a48267..42422c6de2a 100644 --- a/reactos/tools/sysreg/txtmode.cfg +++ b/reactos/tools/sysreg/txtmode.cfg @@ -10,8 +10,8 @@ ROS_EMU_TYPE=qemu ; ; 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 ;