[janderwald] 28901: - end the configuration commit war

Author: janderwald
Date: Thu Sep  6 17:57:55 2007
New Revision: 28901

URL: http://svn.reactos.org/svn/reactos?rev=28901&view=rev
Log:
- end the configuration commit war

Modified:
    trunk/reactos/tools/sysreg/rosboot_test.cpp
    trunk/reactos/tools/sysreg/txtmode.cfg

Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.c...
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.cpp (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Sep  6 17:57:55 2007
@@ -49,7 +49,6 @@
    string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE");
    string RosBootTest::EMU_TYPE_QEMU = _T("qemu");
    string RosBootTest::EMU_TYPE_VMWARE = _T("vmware");
-	string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH");
    string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE");
    string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE");
    string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME");
@@ -61,6 +60,12 @@
    string RosBootTest::ROS_EMU_KILL = _T("ROS_EMU_KILL");
    string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM");
    string RosBootTest::ROS_BOOT_CMD = _T("ROS_BOOT_CMD");
+
+#ifdef __LINUX__
+    string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_LIN");
+#else
+    string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_WIN");
+#endif

//---------------------------------------------------------------------------------------
    RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0)

Modified: trunk/reactos/tools/sysreg/txtmode.cfg
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?re...
==============================================================================
--- trunk/reactos/tools/sysreg/txtmode.cfg (original)
+++ trunk/reactos/tools/sysreg/txtmode.cfg Thu Sep  6 17:57:55 2007
@@ -6,12 +6,12 @@

ROS_EMU_TYPE=qemu

-; ROS_EMU_PATH
+; ROS_EMU_PATH[LIN|WIN]
 ;
 ; This variable sets the path to the emulator 
 ;
-;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
-ROS_EMU_PATH=/usr/bin/qemu
+ROS_EMU_PATH_WIN=E:\reactos\qemu\qemu.exe
+ROS_EMU_PATH_LIN=/usr/bin/qemu

; ROS_HDD_IMAGE
 ;