- Fix MS2PS rule to work on Windows.

- Include PSEH header in the MS2PS generated files.

svn path=/trunk/; revision=10826

diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index f546d03..0651130 100644 (file)
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.78 2004/09/07 08:20:06 hbirr Exp $
+# $Id: helper.mk,v 1.79 2004/09/12 10:22:31 navaraf Exp $

 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:


@@ -1073,7 +1073,7 @@ endif
        $(PCH_CC) $(CFLAGS) $<
 # rule for msvc conversion
 %.c: %_msvc.c
        $(PCH_CC) $(CFLAGS) $<
 # rule for msvc conversion
 %.c: %_msvc.c

-       $(MS2PS) -try try -except except -finally finally < $< > $@
+       $(subst /,$(SEP),$(MS2PS)) -try try -except except -finally finally < $< > $@

 
 # Kill implicit rule
 .o:;
 
 # Kill implicit rule
 .o:;

diff --git a/reactos/tools/ms2ps/ms2ps.cpp b/reactos/tools/ms2ps/ms2ps.cpp
index 32fe8ff..7e2b95e 100644 (file)
--- a/reactos/tools/ms2ps/ms2ps.cpp
+++ b/reactos/tools/ms2ps/ms2ps.cpp
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-/* $Id: ms2ps.cpp,v 1.4 2004/08/21 19:59:52 arty Exp $
+/* $Id: ms2ps.cpp,v 1.5 2004/09/12 10:22:31 navaraf Exp $

  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS seh conversion tool
  * FILE:            tools/ms2ps/ms2ps.cpp
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS seh conversion tool
  * FILE:            tools/ms2ps/ms2ps.cpp


@@ -426,5 +426,6 @@ int main( int argc, char **argv ) {
        handle_try( tok, try_found, tok.end() );
     }
 
        handle_try( tok, try_found, tok.end() );
     }
 

+    tok.push_front("#include <pseh/framebased.h>\n");

     print_tokens( tok.begin(), tok.end() );
 }
     print_tokens( tok.begin(), tok.end() );
 }