Don't try to build modules that won't build.

Support latest MinGW releases.
Support building on linux.

svn path=/trunk/; revision=3454

diff --git a/rosapps/Makefile b/rosapps/Makefile
index 21b3a85..0db8030 100644 (file)
--- a/rosapps/Makefile
+++ b/rosapps/Makefile
@@ -2,38 +2,30 @@
 # Global makefile for the ROSAPPS package
 #
 
 # Global makefile for the ROSAPPS package
 #
 

-#
-# Select your host
-#
-#HOST = djgpp-msdos
-HOST = mingw32-windows
-

 include rules.mak
 
 #
 # Available applications
 #
 include rules.mak
 
 #
 # Available applications
 #

+#net$(SEP)arp
+#net$(SEP)ipconfig
+#net$(SEP)netstat
+#net$(SEP)niclist
+#net$(SEP)telnet
+#net$(SEP)whois

 APPS =         calc \
        cmd \
        cmdutils \
 APPS =         calc \
        cmd \
        cmdutils \

-       cmdutils\touch \

        dflat32 \
        hcalc \
        mc \
        notevil \
        sysutils \
        dflat32 \
        hcalc \
        mc \
        notevil \
        sysutils \

-       sysutils\regexpl \
-       sysutils\tlist \
-       net\arp \
-       net\finger \
-       net\ipconfig \
-       net\ipecho \
-       net\ncftp \
-       net\netstat \
-       net\niclist \
-       net\ping \
-       net\telnet \
-       net\whois \
+       sysutils$(SEP)regexpl \
+       sysutils$(SEP)tlist \
+       net$(SEP)finger \
+       net$(SEP)ncftp \
+       net$(SEP)ping \

        regedit \
        regedt32 \
        taskmgr \
        regedit \
        regedt32 \
        taskmgr \

diff --git a/rosapps/calc/calc.rc b/rosapps/calc/calc.rc
index 38a4a58..2ef1a76 100644 (file)
--- a/rosapps/calc/calc.rc
+++ b/rosapps/calc/calc.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.
 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.

diff --git a/rosapps/cmd/cmd.rc b/rosapps/cmd/cmd.rc
index 18b041e..e095e67 100644 (file)
--- a/rosapps/cmd/cmd.rc
+++ b/rosapps/cmd/cmd.rc
@@ -1,4 +1,4 @@
-#include "../../reactos/include/defines.h"
+#include <windows.h>"

 #include "../../reactos/include/reactos/resource.h"
 #include "cmdver.h"
 
 #include "../../reactos/include/reactos/resource.h"
 #include "cmdver.h"
 

diff --git a/rosapps/cmdutils/more.rc b/rosapps/cmdutils/more.rc
index 054aefa..c3b6bee 100644 (file)
--- a/rosapps/cmdutils/more.rc
+++ b/rosapps/cmdutils/more.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/cmdutils/tee.rc b/rosapps/cmdutils/tee.rc
index f8f7aa8..4ae45dc 100644 (file)
--- a/rosapps/cmdutils/tee.rc
+++ b/rosapps/cmdutils/tee.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/cmdutils/touch/touch.c b/rosapps/cmdutils/touch/touch.c
index 9d8ae54..42640f5 100644 (file)
--- a/rosapps/cmdutils/touch/touch.c
+++ b/rosapps/cmdutils/touch/touch.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)touch.c   5.5 (Berkeley) 3/7/93";
 //#error "__STDC__ defined"
 //#endif
 
 //#error "__STDC__ defined"
 //#endif
 

-#include <sys\utime.h>
+#include <sys/utime.h>

 #include <io.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <io.h>
 #include <fcntl.h>
 #include <getopt.h>

diff --git a/rosapps/cmdutils/touch/touch.rc b/rosapps/cmdutils/touch/touch.rc
index ddd24a9..b1439e5 100644 (file)
--- a/rosapps/cmdutils/touch/touch.rc
+++ b/rosapps/cmdutils/touch/touch.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/cmdutils/y.rc b/rosapps/cmdutils/y.rc
index e8435e9..3f3aee3 100644 (file)
--- a/rosapps/cmdutils/y.rc
+++ b/rosapps/cmdutils/y.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/dflat32/config.c b/rosapps/dflat32/config.c
index 6ac1475..d87ff48 100644 (file)
--- a/rosapps/dflat32/config.c
+++ b/rosapps/dflat32/config.c
@@ -511,4 +511,4 @@ void SetReverseColor(DFWINDOW wnd)
     background = SelectBackground(wnd);
 }
 
     background = SelectBackground(wnd);
 }
 

-/* EOF */
\ No newline at end of file
+/* EOF */

diff --git a/rosapps/dflat32/dflat.h b/rosapps/dflat32/dflat.h
index 0d3ec41..f030e25 100644 (file)
--- a/rosapps/dflat32/dflat.h
+++ b/rosapps/dflat32/dflat.h
@@ -23,8 +23,8 @@
 #include <conio.h>
 #include <ctype.h>
 #include <io.h>
 #include <conio.h>
 #include <ctype.h>
 #include <io.h>

-#include <sys\types.h>
-#include <sys\stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>

 #include <time.h>
 #include <setjmp.h>
 
 #include <time.h>
 #include <setjmp.h>
 

diff --git a/rosapps/dflat32/dialogs.c b/rosapps/dflat32/dialogs.c
index 489b8a7..09fd022 100644 (file)
--- a/rosapps/dflat32/dialogs.c
+++ b/rosapps/dflat32/dialogs.c
@@ -157,4 +157,4 @@ DIALOGBOX( HelpBox )
     CONTROL(BUTTON,  " ~Next >>", 30,  0, 1,  8, ID_NEXT)
 ENDDB
 
     CONTROL(BUTTON,  " ~Next >>", 30,  0, 1,  8, ID_NEXT)
 ENDDB
 

-/* EOF */
\ No newline at end of file
+/* EOF */

diff --git a/rosapps/dflat32/edit.rc b/rosapps/dflat32/edit.rc
index d508e55..0ecda24 100644 (file)
--- a/rosapps/dflat32/edit.rc
+++ b/rosapps/dflat32/edit.rc
@@ -1,5 +1,5 @@
-/* $Id: edit.rc,v 1.1 2000/03/08 22:38:01 ea Exp $ */
-#include <defines.h>
+/* $Id: edit.rc,v 1.2 2002/09/03 18:44:15 chorns Exp $ */
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/dflat32/fileopen.c b/rosapps/dflat32/fileopen.c
index 8a1a870..b4dd9b9 100644 (file)
--- a/rosapps/dflat32/fileopen.c
+++ b/rosapps/dflat32/fileopen.c
@@ -256,4 +256,4 @@ static BOOL IncompleteFilename(char *s)
     return FALSE;
 }
 
     return FALSE;
 }
 

-/* EOF */
\ No newline at end of file
+/* EOF */

diff --git a/rosapps/dflat32/log.c b/rosapps/dflat32/log.c
index d947d3d..87f3053 100644 (file)
--- a/rosapps/dflat32/log.c
+++ b/rosapps/dflat32/log.c
@@ -72,4 +72,4 @@ void MessageLog(DFWINDOW wnd)
 
 #endif
 
 
 #endif
 

-/* EOF */
\ No newline at end of file
+/* EOF */

diff --git a/rosapps/lib/dflat32/dflat32.rc b/rosapps/lib/dflat32/dflat32.rc
index a835c53..5985a77 100644 (file)
--- a/rosapps/lib/dflat32/dflat32.rc
+++ b/rosapps/lib/dflat32/dflat32.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/mc/Makefile b/rosapps/mc/Makefile
index a7e01a3..b937e0c 100644 (file)
--- a/rosapps/mc/Makefile
+++ b/rosapps/mc/Makefile
@@ -1,7 +1,9 @@
+include ../rules.mak
+

 TARGET_OS=NT
 
 TARGET_OS=NT
 

-CC=gcc
-LINK=gcc -s
+#CC=gcc
+LINK=$(CC) -lmsvcrt

 OBJ_SUFFIX=o
 OBJ_PLACE=-o
 EXE_PLACE=-o
 OBJ_SUFFIX=o
 OBJ_PLACE=-o
 EXE_PLACE=-o

diff --git a/rosapps/net/arp/arp.rc b/rosapps/net/arp/arp.rc
index 5be6901..6b79ef6 100644 (file)
--- a/rosapps/net/arp/arp.rc
+++ b/rosapps/net/arp/arp.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/finger/finger.rc b/rosapps/net/finger/finger.rc
index cc50a37..abf1ef8 100644 (file)
--- a/rosapps/net/finger/finger.rc
+++ b/rosapps/net/finger/finger.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/ipconfig/ipconfig.rc b/rosapps/net/ipconfig/ipconfig.rc
index 018272b..791a229 100644 (file)
--- a/rosapps/net/ipconfig/ipconfig.rc
+++ b/rosapps/net/ipconfig/ipconfig.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/ncftp/ncftp.rc b/rosapps/net/ncftp/ncftp.rc
index b51db8f..e651810 100644 (file)
--- a/rosapps/net/ncftp/ncftp.rc
+++ b/rosapps/net/ncftp/ncftp.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/netstat/netstat.rc b/rosapps/net/netstat/netstat.rc
index 0d15370..f83075e 100644 (file)
--- a/rosapps/net/netstat/netstat.rc
+++ b/rosapps/net/netstat/netstat.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 #include "resource.h"
 #include <reactos/resource.h>
 
 #include "resource.h"

diff --git a/rosapps/net/niclist/niclist.rc b/rosapps/net/niclist/niclist.rc
index fb8236d..1a2d3cb 100644 (file)
--- a/rosapps/net/niclist/niclist.rc
+++ b/rosapps/net/niclist/niclist.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/ping/ping.rc b/rosapps/net/ping/ping.rc
index 0a4e588..7034128 100644 (file)
--- a/rosapps/net/ping/ping.rc
+++ b/rosapps/net/ping/ping.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/telnet/telnet.rc b/rosapps/net/telnet/telnet.rc
index aa9e5fe..51c10b5 100644 (file)
--- a/rosapps/net/telnet/telnet.rc
+++ b/rosapps/net/telnet/telnet.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/net/whois/whois.rc b/rosapps/net/whois/whois.rc
index 76c16b2..b79866b 100644 (file)
--- a/rosapps/net/whois/whois.rc
+++ b/rosapps/net/whois/whois.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/notevil/notevil.rc b/rosapps/notevil/notevil.rc
index 6329e4e..3245045 100644 (file)
--- a/rosapps/notevil/notevil.rc
+++ b/rosapps/notevil/notevil.rc
@@ -1,5 +1,5 @@
-/* $Id: notevil.rc,v 1.7 2002/07/07 19:47:04 robd Exp $ */
-#include "../../reactos/include/defines.h"
+/* $Id: notevil.rc,v 1.8 2002/09/03 18:44:17 chorns Exp $ */
+#include <windows.h>

 #include "../../reactos/include/reactos/resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include "../../reactos/include/reactos/resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/regedit/regedit.rc b/rosapps/regedit/regedit.rc
index 2df3c5f..a2e5391 100644 (file)
--- a/rosapps/regedit/regedit.rc
+++ b/rosapps/regedit/regedit.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 #include "resource.h"
 #include <reactos/resource.h>
 
 #include "resource.h"

diff --git a/rosapps/regedt32/regedt32.rc b/rosapps/regedt32/regedt32.rc
index ab3367c..a5c14c1 100644 (file)
--- a/rosapps/regedt32/regedt32.rc
+++ b/rosapps/regedt32/regedt32.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.
 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.

diff --git a/rosapps/rules.mak b/rosapps/rules.mak
index cbc04f6..4812150 100644 (file)
--- a/rosapps/rules.mak
+++ b/rosapps/rules.mak
@@ -8,6 +8,7 @@
 #HOST = mingw32-windows
 #HOST = mingw32-linux
 #
 #HOST = mingw32-windows
 #HOST = mingw32-linux
 #

+

 # Windows is default host environment
 ifeq ($(HOST),)
 HOST = mingw32-windows
 # Windows is default host environment
 ifeq ($(HOST),)
 HOST = mingw32-windows


@@ -22,13 +23,16 @@ endif
 # Choose various options
 #
 ifeq ($(HOST),mingw32-linux)
 # Choose various options
 #
 ifeq ($(HOST),mingw32-linux)

-PREFIX = i586-mingw32-
+PREFIX = mingw32-

 EXE_POSTFIX = 
 CP = cp
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
 EXE_POSTFIX = 
 CP = cp
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as

-FLOPPY_DIR = A/
+RM = rm
+DOSCLI = no
+FLOPPY_DIR = /mnt/floppy

 # DIST_DIR should be relative from the top of the tree
 DIST_DIR = dist
 # DIST_DIR should be relative from the top of the tree
 DIST_DIR = dist

+SEP = /

 endif
 
 
 endif
 
 


@@ -42,6 +46,7 @@ DOSCLI = yes
 FLOPPY_DIR = A:
 # DIST_DIR should be relative from the top of the tree
 DIST_DIR = dist
 FLOPPY_DIR = A:
 # DIST_DIR should be relative from the top of the tree
 DIST_DIR = dist

+SEP = \$($EMPTY_VAR)

 endif
 
 #
 endif
 
 #


@@ -65,6 +70,7 @@ else
 LEAN_AND_MEAN_DEFINE = 
 endif 
 
 LEAN_AND_MEAN_DEFINE = 
 endif 
 

+CPP = $(PREFIX)g++

 CC = $(PREFIX)gcc
 NATIVE_CC = gcc
 CFLAGS = \
 CC = $(PREFIX)gcc
 NATIVE_CC = gcc
 CFLAGS = \


@@ -84,18 +90,16 @@ NM = $(PREFIX)nm
 OBJCOPY = $(PREFIX)objcopy
 STRIP = $(PREFIX)strip
 AS = $(PREFIX)gcc -c -x assembler-with-cpp
 OBJCOPY = $(PREFIX)objcopy
 STRIP = $(PREFIX)strip
 AS = $(PREFIX)gcc -c -x assembler-with-cpp

-CPP = $(PREFIX)cpp

 AR = $(PREFIX)ar
 RC = $(PREFIX)windres
 AR = $(PREFIX)ar
 RC = $(PREFIX)windres

-RCINC = --include-dir ../reactos/include --include-dir ../../reactos/include --include-dir ../../../reactos/include
-
+RCINC = --include-dir $(PATH_TO_TOP)/../reactos/include

 TOOLS_PATH = $(PATH_TO_TOP)/../reactos/tools
 RSYM = $(TOOLS_PATH)/rsym
 
 %.o: %.cpp
 TOOLS_PATH = $(PATH_TO_TOP)/../reactos/tools
 RSYM = $(TOOLS_PATH)/rsym
 
 %.o: %.cpp

-       $(CC) $(CFLAGS) -c $< -o $@
+       $(CPP) $(CFLAGS) -c $< -o $@

 %.o: %.cc
 %.o: %.cc

-       $(CC) $(CFLAGS) -c $< -o $@
+       $(CPP) $(CFLAGS) -c $< -o $@

 %.o: %.c
        $(CC) $(CFLAGS) -c $< -o $@
 %.o: %.asm
 %.o: %.c
        $(CC) $(CFLAGS) -c $< -o $@
 %.o: %.asm

diff --git a/rosapps/sysutils/chkdsk.rc b/rosapps/sysutils/chkdsk.rc
index 81de8ac..f72fc2b 100644 (file)
--- a/rosapps/sysutils/chkdsk.rc
+++ b/rosapps/sysutils/chkdsk.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/chklib.rc b/rosapps/sysutils/chklib.rc
index f0660cb..b202ac9 100644 (file)
--- a/rosapps/sysutils/chklib.rc
+++ b/rosapps/sysutils/chklib.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/format.rc b/rosapps/sysutils/format.rc
index 7a3091b..2d3a39d 100644 (file)
--- a/rosapps/sysutils/format.rc
+++ b/rosapps/sysutils/format.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/ldd.rc b/rosapps/sysutils/ldd.rc
index 5fbc507..a567870 100644 (file)
--- a/rosapps/sysutils/ldd.rc
+++ b/rosapps/sysutils/ldd.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile
index 4d42779..4ac5fe5 100644 (file)
--- a/rosapps/sysutils/makefile
+++ b/rosapps/sysutils/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 2001/10/16 21:02:02 ea Exp $
+# $Id: makefile,v 1.11 2002/09/03 18:44:18 chorns Exp $

 #
 # ReactOS System Utilities
 #
 #
 # ReactOS System Utilities
 #


@@ -36,16 +36,16 @@ IMPORT_FMIFS=$(ROS_LIB)/fmifs.a
 IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a
 IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a
 IMPORT_USER32=$(ROS_LIB)/user32.a
 IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a
 IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a
 IMPORT_USER32=$(ROS_LIB)/user32.a

-IMPORT_MSVCRT=$(ROS_LIB)/msvcrt.a
+IMPORT_MSVCRT=

 
 TARGET=\
 
 TARGET=\

-       chklib$(EXE_POSTFIX)    \
-       ldd$(EXE_POSTFIX)       \
-       pedump$(EXE_POSTFIX)    \
-       shutdown$(EXE_POSTFIX)  \
-       chkdsk$(EXE_POSTFIX)    \
-       format$(EXE_POSTFIX)    \
-       regexpl/regexpl$(EXE_POSTFIX)
+       chklib.exe \
+       ldd.exe \
+       pedump.exe \
+       shutdown.exe \
+       chkdsk.exe \
+       format.exe \
+       regexpl/regexpl.exe

 
 all: $(TARGET)
 
 
 all: $(TARGET)
 


@@ -126,7 +126,7 @@ ldd.o: ldd.c
 
 # By Nedko Arnaoudov
 
 
 # By Nedko Arnaoudov
 

-regexpl/regexpl$(EXE_POSTFIX):
+regexpl/regexpl.exe:

        make -C regexpl
 
 #---
        make -C regexpl
 
 #---

diff --git a/rosapps/sysutils/pedump.rc b/rosapps/sysutils/pedump.rc
index 31322f9..87e7278 100644 (file)
--- a/rosapps/sysutils/pedump.rc
+++ b/rosapps/sysutils/pedump.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/regexpl/CrtSupplement.c b/rosapps/sysutils/regexpl/CrtSupplement.c
index 750080f..50d7516 100644 (file)
--- a/rosapps/sysutils/regexpl/CrtSupplement.c
+++ b/rosapps/sysutils/regexpl/CrtSupplement.c
@@ -1,4 +1,4 @@
-/* $Id: CrtSupplement.c,v 1.1 2000/10/04 21:04:30 ea Exp $
+/* $Id: CrtSupplement.c,v 1.2 2002/09/03 18:44:18 chorns Exp $

  *
  * Written by EA because ReactOS hasn't yet _ui64toa()
  * (it's in msvcrt.dll, and not in crtdll.dll). 
  *
  * Written by EA because ReactOS hasn't yet _ui64toa()
  * (it's in msvcrt.dll, and not in crtdll.dll). 


@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 static
 #include <stdlib.h>
 
 static

-char DigitMap [36] = "0123456789abcdefghijklmnopqrstuvwxyz";
+char DigitMap [] = "0123456789abcdefghijklmnopqrstuvwxyz";

 
 char *
 _ui64toa (
 
 char *
 _ui64toa (

diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile
index 04c2c82..0379573 100644 (file)
--- a/rosapps/sysutils/regexpl/Makefile
+++ b/rosapps/sysutils/regexpl/Makefile
@@ -1,13 +1,15 @@
-# $Id: Makefile,v 1.6 2001/10/16 21:02:02 ea Exp $
+# $Id: Makefile,v 1.7 2002/09/03 18:44:18 chorns Exp $

 #
 #  ReactOS makefile for RegExpl
 #
 
 #
 #  ReactOS makefile for RegExpl
 #
 

-include ../../rules.mak
+PATH_TO_TOP = ../..
+
+include $(PATH_TO_TOP)/rules.mak

 
 TARGET_NAME=regexpl
 
 
 TARGET_NAME=regexpl
 

-all: $(TARGET_NAME)$(EXE_POSTFIX)
+all: $(TARGET_NAME).exe

 
 include depend.mak
 
 
 include depend.mak
 


@@ -19,7 +21,6 @@ IMPORT_FMIFS=$(ROS_LIB)/fmifs.a
 IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a
 IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a
 IMPORT_USER32=$(ROS_LIB)/user32.a
 IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a
 IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a
 IMPORT_USER32=$(ROS_LIB)/user32.a

-IMPORT_CRTDLL=$(ROS_LIB)/crtdll.a

 
 depend.mak : *.h
        $(CC) \
 
 depend.mak : *.h
        $(CC) \


@@ -65,11 +66,10 @@ CLEAN_FILES = \
 
 
 $(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS)
 
 
 $(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS)

-       $(CC) \
+       $(CPP) \

                -Wl,--subsystem,console \
                -o $@                           \
                $(IMPORT_KERNEL32)      \
                -Wl,--subsystem,console \
                -o $@                           \
                $(IMPORT_KERNEL32)      \

-               $(IMPORT_CRTDLL)        \

                $(IMPORT_USER32)        \
                $(OBJECTS)
        $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym
                $(IMPORT_USER32)        \
                $(OBJECTS)
        $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym

diff --git a/rosapps/sysutils/regexpl/RegistryKey.cpp b/rosapps/sysutils/regexpl/RegistryKey.cpp
index f364310..db84f03 100644 (file)
--- a/rosapps/sysutils/regexpl/RegistryKey.cpp
+++ b/rosapps/sysutils/regexpl/RegistryKey.cpp
@@ -1,4 +1,4 @@
-/* $Id: RegistryKey.cpp,v 1.5 2002/01/04 22:07:38 hbirr Exp $
+/* $Id: RegistryKey.cpp,v 1.6 2002/09/03 18:44:18 chorns Exp $

  *
  * regexpl - Console Registry Explorer
  *
  *
  * regexpl - Console Registry Explorer
  *


@@ -50,7 +50,7 @@ CRegistryKey::CRegistryKey()
        m_hKey = NULL;
 }
 
        m_hKey = NULL;
 }
 

-HRESULT CRegistryKey::InitRoot(const TCHAR *pszMachineName = NULL)
+HRESULT CRegistryKey::InitRoot(const TCHAR *pszMachineName)

 {
   if ((pszMachineName)&&
       ((_tcslen(pszMachineName) < 3)||
 {
   if ((pszMachineName)&&
       ((_tcslen(pszMachineName) < 3)||

diff --git a/rosapps/sysutils/regexpl/regexpl.rc b/rosapps/sysutils/regexpl/regexpl.rc
index e37dd33..ad6247b 100644 (file)
--- a/rosapps/sysutils/regexpl/regexpl.rc
+++ b/rosapps/sysutils/regexpl/regexpl.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/shutdown.rc b/rosapps/sysutils/shutdown.rc
index 35e126a..a3c56ba 100644 (file)
--- a/rosapps/sysutils/shutdown.rc
+++ b/rosapps/sysutils/shutdown.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/sysutils/tlist/tlist.c b/rosapps/sysutils/tlist/tlist.c
index 4cd72d6..5768006 100644 (file)
--- a/rosapps/sysutils/tlist/tlist.c
+++ b/rosapps/sysutils/tlist/tlist.c
@@ -1,4 +1,4 @@
-/* $Id: tlist.c,v 1.1 2001/11/04 21:53:20 ea Exp $
+/* $Id: tlist.c,v 1.2 2002/09/03 18:44:18 chorns Exp $

  *
  * ReactOS Project
  * TList
  *
  * ReactOS Project
  * TList


@@ -6,7 +6,7 @@
  * Copyright (c) 2000,2001 Emanuele Aliberti
  */
 #include <reactos/buildno.h>
  * Copyright (c) 2000,2001 Emanuele Aliberti
  */
 #include <reactos/buildno.h>

-#define NTOS_MODE_USER
+#define NTOS_USER_MODE

 #include <ntos.h>
 
 #include <stdio.h>
 #include <ntos.h>
 
 #include <stdio.h>

diff --git a/rosapps/sysutils/tlist/tlist.rc b/rosapps/sysutils/tlist/tlist.rc
index b3a825e..5b59795 100644 (file)
--- a/rosapps/sysutils/tlist/tlist.rc
+++ b/rosapps/sysutils/tlist/tlist.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/rosapps/templates/dialog/dialog.rc b/rosapps/templates/dialog/dialog.rc
index e3218c8..42f7659 100644 (file)
--- a/rosapps/templates/dialog/dialog.rc
+++ b/rosapps/templates/dialog/dialog.rc
@@ -7,8 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //

-#include "defines.h"
-#include "reactos\resource.h"
+#include <windows.h>
+#include <reactos/resource.h>

 #include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/rosapps/templates/mdi/mdi.rc b/rosapps/templates/mdi/mdi.rc
index bd2f82c..d35ff1b 100644 (file)
--- a/rosapps/templates/mdi/mdi.rc
+++ b/rosapps/templates/mdi/mdi.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.
 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.

diff --git a/rosapps/winfile/winfile.rc b/rosapps/winfile/winfile.rc
index 1b04fce..64fb4d2 100644 (file)
--- a/rosapps/winfile/winfile.rc
+++ b/rosapps/winfile/winfile.rc
@@ -1,4 +1,4 @@
-#include <defines.h>
+#include <windows.h>

 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.
 #include <reactos/resource.h>
 
 //Microsoft Developer Studio generated resource script.