[ros-diffs] [weiden] 28096: Fix compiling rostests

Author: weiden
Date: Thu Aug  2 10:59:36 2007
New Revision: 28096

URL: http://svn.reactos.org/svn/reactos?rev=28096&view=rev
Log:
Fix compiling rostests

Added:
    trunk/reactos/base/shell/cmd/main.c   (with props)
Modified:
    trunk/reactos/base/shell/cmd/cmd.c
    trunk/reactos/base/shell/cmd/cmd.h
    trunk/reactos/base/shell/cmd/cmd.rbuild
    trunk/reactos/base/shell/cmd/precomp.h

Modified: trunk/reactos/base/shell/cmd/cmd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c (original)
+++ trunk/reactos/base/shell/cmd/cmd.c Thu Aug  2 10:59:36 2007
@@ -1836,7 +1836,7 @@
 /*
  * main function
  */
-int _tmain (int argc, const TCHAR *argv[])
+int cmd_main (int argc, const TCHAR *argv[])
 {
 	TCHAR startPath[MAX_PATH];
 	CONSOLE_SCREEN_BUFFER_INFO Info;

Modified: trunk/reactos/base/shell/cmd/cmd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.h (original)
+++ trunk/reactos/base/shell/cmd/cmd.h Thu Aug  2 10:59:36 2007
@@ -101,6 +101,7 @@
 VOID AddBreakHandler (VOID);
 VOID RemoveBreakHandler (VOID);
 VOID DoCommand (LPTSTR line);
+int cmd_main (int argc, const TCHAR *argv[]);
 
 extern HANDLE CMD_ModuleHandle;
 

Modified: trunk/reactos/base/shell/cmd/cmd.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.rbuild (original)
+++ trunk/reactos/base/shell/cmd/cmd.rbuild Thu Aug  2 10:59:36 2007
@@ -1,14 +1,12 @@
-<module name="cmd" type="win32cui"
installbase="system32" installname="cmd.exe"
unicode="yes">
+<module name="cmd_base" type="objectlibrary">
 	<include base="ReactOS">include/reactos/wine</include>
-	<include base="cmd">.</include>
+	<include base="cmd_base">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="_DEBUG_MEM" />
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>shell32</library>
-	<library>user32</library>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<pch>precomp.h</pch>
 	<compilationunit name="unit.c">
 		<file>alias.c</file>
@@ -66,5 +64,18 @@
 		<file>where.c</file>
 		<file>window.c</file>
 	</compilationunit>
+</module>
+<module name="cmd" type="win32cui"
installbase="system32" installname="cmd.exe"
unicode="yes">
+	<include base="ReactOS">include/reactos/wine</include>
+	<include base="cmd">.</include>
+	<define name="__USE_W32API" />
+	<define name="ANONYMOUSUNIONS" />
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>cmd_base</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<library>user32</library>
 	<file>cmd.rc</file>
+	<file>main.c</file>
 </module>

Added: trunk/reactos/base/shell/cmd/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/main.c?rev=…
==============================================================================
--- trunk/reactos/base/shell/cmd/main.c (added)
+++ trunk/reactos/base/shell/cmd/main.c Thu Aug  2 10:59:36 2007
@@ -1,0 +1,6 @@
+#include <precomp.h>
+
+int _tmain (int argc, const TCHAR *argv[])
+{
+    return cmd_main(argc, argv);
+}

Propchange: trunk/reactos/base/shell/cmd/main.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/shell/cmd/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r…
==============================================================================
--- trunk/reactos/base/shell/cmd/precomp.h (original)
+++ trunk/reactos/base/shell/cmd/precomp.h Thu Aug  2 10:59:36 2007
@@ -1,3 +1,6 @@
+#ifndef __CMD_PRECOMP_H
+#define __CMD_PRECOMP_H
+
 #ifdef _MSC_VER
 #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */
 #undef _CRT_SECURE_NO_DEPRECATE
@@ -32,3 +35,4 @@
 
 #include <reactos/resource.h>
 
+#endif /* __CMD_PRECOMP_H */