From 84114428d7d659ca58dc62b8bc236f838a889f63 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Tue, 16 Oct 2001 21:02:02 +0000 Subject: [PATCH] Fixes to compile the whole set of ROS applications. Hartmut Birr added to the ROS console parade. svn path=/trunk/; revision=2299 --- rosapps/cmd/makefile.lcc | 76 ------------------------------- rosapps/notevil/makefile | 15 ++++-- rosapps/notevil/makefile.lcc | 21 --------- rosapps/notevil/notevil.rc | 3 +- rosapps/notevil/resource.h | 2 +- rosapps/readme.txt | 9 +++- rosapps/sysutils/makefile | 17 +++---- rosapps/sysutils/regexpl/Makefile | 16 +++---- 8 files changed, 38 insertions(+), 121 deletions(-) delete mode 100644 rosapps/cmd/makefile.lcc delete mode 100644 rosapps/notevil/makefile.lcc diff --git a/rosapps/cmd/makefile.lcc b/rosapps/cmd/makefile.lcc deleted file mode 100644 index c698af82153..00000000000 --- a/rosapps/cmd/makefile.lcc +++ /dev/null @@ -1,76 +0,0 @@ -# ReactOS cmd.exe makefile for lcc-win32 -# 19990119 Emanuele Aliberti -# 19990127 EA -# 19990128 Eric Kohl -# Modified for cmd 0.0.4pre3. -# -# ReactOS : http://www.reactos.com -# Lcc-Win32: http://www.cs.virginia.edu/*lcc-win32 -# -TARGET=cmd -CC=lcc.exe -CFLAGS=-c -O -LD=lcclnk.exe -LFLAGS=-subsystem console -s -o $(TARGET).exe -OBJS=alias.obj \ - attrib.obj \ - batch.obj \ - beep.obj \ - call.obj \ - chcp.obj \ - choice.obj \ - cls.obj \ - cmd.obj \ - cmdinput.obj \ - cmdtable.obj \ - color.obj \ - console.obj \ - copy.obj \ - date.obj \ - del.obj \ - delay.obj \ - dir.obj \ - dirstack.obj \ - echo.obj \ - error.obj \ - filecomp.obj \ - for.obj \ - free.obj \ - goto.obj \ - history.obj \ - if.obj \ - internal.obj \ - label.obj \ - locale.obj \ - memory.obj \ - misc.obj \ - move.obj \ - msgbox.obj \ - path.obj \ - pause.obj \ - prompt.obj \ - redir.obj \ - ren.obj \ - screen.obj \ - set.obj \ - shift.obj \ - start.obj \ - time.obj \ - timer.obj \ - title.obj \ - type.obj \ - ver.obj \ - verify.obj \ - vol.obj \ - where.obj - -# MAIN - -.c.obj: - $(CC) $(CFLAGS) $< - -$(TARGET).exe: $(OBJS) - $(LD) $(LFLAGS) $(OBJS) - - -#EOF diff --git a/rosapps/notevil/makefile b/rosapps/notevil/makefile index 04bfcd0dfe6..814dbfccf24 100644 --- a/rosapps/notevil/makefile +++ b/rosapps/notevil/makefile @@ -1,10 +1,15 @@ -# $Id: makefile,v 1.4 2001/07/28 08:02:05 ea Exp $ +# $Id: makefile,v 1.5 2001/10/16 21:02:02 ea Exp $ # # ReactOS makefile for notevil # Compiler: egcs 1.1.2 # +PATH_TO_TOP = .. +PATH_TO_REACTOS = $(PATH_TO_TOP)/../reactos + TARGET=notevil +BASE_CFLAGS = -I$(PATH_TO_REACTOS)/include + all: $(TARGET).exe OBJECTS = $(TARGET).o $(TARGET).coff @@ -41,15 +46,15 @@ else endif -dist: $(TARGET:%=../$(DIST_DIR)/apps/%) +dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%) -$(TARGET:%=../$(DIST_DIR)/apps/%): ../$(DIST_DIR)/apps/%: % +$(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%: % ifeq ($(DOSCLI),yes) $(CP) $* ..\$(DIST_DIR)\apps\$* else - $(CP) $* ../$(DIST_DIR)/apps/$* + $(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps/$* endif -include ../rules.mak +include $(PATH_TO_TOP)/rules.mak # EOF diff --git a/rosapps/notevil/makefile.lcc b/rosapps/notevil/makefile.lcc deleted file mode 100644 index 83e9bf3ec40..00000000000 --- a/rosapps/notevil/makefile.lcc +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: makefile.lcc,v 1.1 1999/05/15 07:23:34 ea Exp $ -# Makefile for lcc-win32 -# -CC=lcc.exe -CFLAGS=-c -O -LD=lcclnk.exe -LFLAGS=-s -RC=lrc.exe - -OBJECTS=notevil.obj notevil.res - -notevil.exe: $(OBJECTS) - $(LD) $(LFLAGS) $(OBJECTS) - -notevil.obj: notevil.c resource.h - $(CC) $(CFLAGS) notevil.c - -notevil.res: notevil.rc - $(RC) notevil.rc - -# EOF diff --git a/rosapps/notevil/notevil.rc b/rosapps/notevil/notevil.rc index 55dd6e88d38..6ff392b3910 100644 --- a/rosapps/notevil/notevil.rc +++ b/rosapps/notevil/notevil.rc @@ -1,4 +1,4 @@ -/* $Id: notevil.rc,v 1.4 2000/09/12 23:21:20 ea Exp $ */ +/* $Id: notevil.rc,v 1.5 2001/10/16 21:02:02 ea Exp $ */ #include "../../reactos/include/defines.h" #include "../../reactos/include/reactos/resource.h" @@ -69,6 +69,7 @@ BEGIN 19, "Paolo Pantaleo" 20, "Hernan Ochoa" 21, "Casper Hornstrup" + 22, "Hartmut Birr" END /* EOF */ diff --git a/rosapps/notevil/resource.h b/rosapps/notevil/resource.h index bc3f4c4d71c..fe418cb9850 100644 --- a/rosapps/notevil/resource.h +++ b/rosapps/notevil/resource.h @@ -1,2 +1,2 @@ #define RES_FIRST_INDEX 1 -#define RES_LAST_INDEX 21 +#define RES_LAST_INDEX 22 diff --git a/rosapps/readme.txt b/rosapps/readme.txt index beb7a2e0b84..4ae5d359557 100644 --- a/rosapps/readme.txt +++ b/rosapps/readme.txt @@ -1,3 +1,5 @@ +$Id: readme.txt,v 1.3 2001/10/16 21:02:01 ea Exp $ + This directory contains core applications that support the ReactOS kernel. @@ -7,6 +9,11 @@ variable in 'rules.mak'. The following is a short decription of each. Check the readme.txt under each application for more details. -CMD: This is Eric Kohl's port of COMMAND for ReactOS. +CMD : This is Eric Kohl's port of COMMAND for ReactOS. +CMDUTILS: External commands for CMD. +DEVUTILS: +DFLAT32 : +NOTEVIL : ReactOS Coders Console Parade. +SYSUTILS: ReactOS System Utilities. diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile index 88cf1a77e00..4d427790a76 100644 --- a/rosapps/sysutils/makefile +++ b/rosapps/sysutils/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.9 2001/07/28 08:02:05 ea Exp $ +# $Id: makefile,v 1.10 2001/10/16 21:02:02 ea Exp $ # # ReactOS System Utilities # @@ -21,6 +21,7 @@ # 2000-08-4 (ea) # Added ldd.c; removed login.c # +# PATH_TO_TOP=.. PATH_TO_CVSROOT=../$(PATH_TO_TOP) @@ -29,13 +30,13 @@ BASE_CFLAGS = -I$(PATH_TO_CVSROOT)/reactos/include ROS_DIR=$(PATH_TO_CVSROOT)/reactos ROS_INC=$(ROS_DIR)/include -ROS_LIB=$(ROS_DIR)/lib -IMPORT_NTDLL=$(ROS_LIB)/ntdll/ntdll.a -IMPORT_FMIFS=$(ROS_LIB)/fmifs/fmifs.a -IMPORT_KERNEL32=$(ROS_LIB)/kernel32/kernel32.a -IMPORT_ADVAPI32=$(ROS_LIB)/advapi32/advapi32.a -IMPORT_USER32=$(ROS_LIB)/user32/user32.a -IMPORT_MSVCRT=$(ROS_LIB)/msvcrt/msvcrt.a +ROS_LIB=$(ROS_DIR)/dk/w32/lib +IMPORT_NTDLL=$(ROS_LIB)/ntdll.a +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_MSVCRT=$(ROS_LIB)/msvcrt.a TARGET=\ chklib$(EXE_POSTFIX) \ diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile index ba8b93d1cb9..04c2c824a51 100644 --- a/rosapps/sysutils/regexpl/Makefile +++ b/rosapps/sysutils/regexpl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 2001/04/16 05:11:54 narnaoud Exp $ +# $Id: Makefile,v 1.6 2001/10/16 21:02:02 ea Exp $ # # ReactOS makefile for RegExpl # @@ -13,13 +13,13 @@ include depend.mak ROS_DIR=../../../reactos ROS_INC=$(ROS_DIR)/include -ROS_LIB=$(ROS_DIR)/lib -IMPORT_NTDLL=$(ROS_LIB)/ntdll/ntdll.a -IMPORT_FMIFS=$(ROS_LIB)/fmifs/fmifs.a -IMPORT_KERNEL32=$(ROS_LIB)/kernel32/kernel32.a -IMPORT_ADVAPI32=$(ROS_LIB)/advapi32/advapi32.a -IMPORT_USER32=$(ROS_LIB)/user32/user32.a -IMPORT_CRTDLL=$(ROS_LIB)/crtdll/crtdll.a +ROS_LIB=$(ROS_DIR)/dk/w32/lib +IMPORT_NTDLL=$(ROS_LIB)/ntdll.a +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_CRTDLL=$(ROS_LIB)/crtdll.a depend.mak : *.h $(CC) \ -- 2.17.1