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

Support latest MinGW releases.
Support building on linux.

svn path=/trunk/; revision=3454
This commit is contained in:
Casper Hornstrup 2002-09-03 18:44:19 +00:00
parent f8310e0ce2
commit 068a37b1cd
45 changed files with 89 additions and 91 deletions

View file

@ -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 include rules.mak
# #
# Available applications # Available applications
# #
#net$(SEP)arp
#net$(SEP)ipconfig
#net$(SEP)netstat
#net$(SEP)niclist
#net$(SEP)telnet
#net$(SEP)whois
APPS = calc \ APPS = calc \
cmd \ cmd \
cmdutils \ cmdutils \
cmdutils\touch \
dflat32 \ dflat32 \
hcalc \ hcalc \
mc \ mc \
notevil \ notevil \
sysutils \ sysutils \
sysutils\regexpl \ sysutils$(SEP)regexpl \
sysutils\tlist \ sysutils$(SEP)tlist \
net\arp \ net$(SEP)finger \
net\finger \ net$(SEP)ncftp \
net\ipconfig \ net$(SEP)ping \
net\ipecho \
net\ncftp \
net\netstat \
net\niclist \
net\ping \
net\telnet \
net\whois \
regedit \ regedit \
regedt32 \ regedt32 \
taskmgr \ taskmgr \

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.

View file

@ -1,4 +1,4 @@
#include "../../reactos/include/defines.h" #include <windows.h>"
#include "../../reactos/include/reactos/resource.h" #include "../../reactos/include/reactos/resource.h"
#include "cmdver.h" #include "cmdver.h"

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -54,7 +54,7 @@ static char sccsid[] = "@(#)touch.c 5.5 (Berkeley) 3/7/93";
//#error "__STDC__ defined" //#error "__STDC__ defined"
//#endif //#endif
#include <sys\utime.h> #include <sys/utime.h>
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <getopt.h>

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -511,4 +511,4 @@ void SetReverseColor(DFWINDOW wnd)
background = SelectBackground(wnd); background = SelectBackground(wnd);
} }
/* EOF */ /* EOF */

View file

@ -23,8 +23,8 @@
#include <conio.h> #include <conio.h>
#include <ctype.h> #include <ctype.h>
#include <io.h> #include <io.h>
#include <sys\types.h> #include <sys/types.h>
#include <sys\stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
#include <setjmp.h> #include <setjmp.h>

View file

@ -157,4 +157,4 @@ DIALOGBOX( HelpBox )
CONTROL(BUTTON, " ~Next >>", 30, 0, 1, 8, ID_NEXT) CONTROL(BUTTON, " ~Next >>", 30, 0, 1, 8, ID_NEXT)
ENDDB ENDDB
/* EOF */ /* EOF */

View file

@ -1,5 +1,5 @@
/* $Id: edit.rc,v 1.1 2000/03/08 22:38:01 ea Exp $ */ /* $Id: edit.rc,v 1.2 2002/09/03 18:44:15 chorns Exp $ */
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -256,4 +256,4 @@ static BOOL IncompleteFilename(char *s)
return FALSE; return FALSE;
} }
/* EOF */ /* EOF */

View file

@ -72,4 +72,4 @@ void MessageLog(DFWINDOW wnd)
#endif #endif
/* EOF */ /* EOF */

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,7 +1,9 @@
include ../rules.mak
TARGET_OS=NT TARGET_OS=NT
CC=gcc #CC=gcc
LINK=gcc -s LINK=$(CC) -lmsvcrt
OBJ_SUFFIX=o OBJ_SUFFIX=o
OBJ_PLACE=-o OBJ_PLACE=-o
EXE_PLACE=-o EXE_PLACE=-o

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
#include "resource.h" #include "resource.h"

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,5 +1,5 @@
/* $Id: notevil.rc,v 1.7 2002/07/07 19:47:04 robd Exp $ */ /* $Id: notevil.rc,v 1.8 2002/09/03 18:44:17 chorns Exp $ */
#include "../../reactos/include/defines.h" #include <windows.h>
#include "../../reactos/include/reactos/resource.h" #include "../../reactos/include/reactos/resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
#include "resource.h" #include "resource.h"

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.

View file

@ -8,6 +8,7 @@
#HOST = mingw32-windows #HOST = mingw32-windows
#HOST = mingw32-linux #HOST = mingw32-linux
# #
# Windows is default host environment # Windows is default host environment
ifeq ($(HOST),) ifeq ($(HOST),)
HOST = mingw32-windows HOST = mingw32-windows
@ -22,13 +23,16 @@ endif
# Choose various options # Choose various options
# #
ifeq ($(HOST),mingw32-linux) ifeq ($(HOST),mingw32-linux)
PREFIX = i586-mingw32- PREFIX = mingw32-
EXE_POSTFIX = EXE_POSTFIX =
CP = cp CP = cp
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as 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 should be relative from the top of the tree
DIST_DIR = dist DIST_DIR = dist
SEP = /
endif endif
@ -42,6 +46,7 @@ DOSCLI = yes
FLOPPY_DIR = A: FLOPPY_DIR = A:
# DIST_DIR should be relative from the top of the tree # DIST_DIR should be relative from the top of the tree
DIST_DIR = dist DIST_DIR = dist
SEP = \$($EMPTY_VAR)
endif endif
# #
@ -65,6 +70,7 @@ else
LEAN_AND_MEAN_DEFINE = LEAN_AND_MEAN_DEFINE =
endif endif
CPP = $(PREFIX)g++
CC = $(PREFIX)gcc CC = $(PREFIX)gcc
NATIVE_CC = gcc NATIVE_CC = gcc
CFLAGS = \ CFLAGS = \
@ -84,18 +90,16 @@ NM = $(PREFIX)nm
OBJCOPY = $(PREFIX)objcopy OBJCOPY = $(PREFIX)objcopy
STRIP = $(PREFIX)strip STRIP = $(PREFIX)strip
AS = $(PREFIX)gcc -c -x assembler-with-cpp AS = $(PREFIX)gcc -c -x assembler-with-cpp
CPP = $(PREFIX)cpp
AR = $(PREFIX)ar AR = $(PREFIX)ar
RC = $(PREFIX)windres 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 TOOLS_PATH = $(PATH_TO_TOP)/../reactos/tools
RSYM = $(TOOLS_PATH)/rsym RSYM = $(TOOLS_PATH)/rsym
%.o: %.cpp %.o: %.cpp
$(CC) $(CFLAGS) -c $< -o $@ $(CPP) $(CFLAGS) -c $< -o $@
%.o: %.cc %.o: %.cc
$(CC) $(CFLAGS) -c $< -o $@ $(CPP) $(CFLAGS) -c $< -o $@
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
%.o: %.asm %.o: %.asm

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -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_KERNEL32=$(ROS_LIB)/kernel32.a
IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a
IMPORT_USER32=$(ROS_LIB)/user32.a IMPORT_USER32=$(ROS_LIB)/user32.a
IMPORT_MSVCRT=$(ROS_LIB)/msvcrt.a IMPORT_MSVCRT=
TARGET=\ TARGET=\
chklib$(EXE_POSTFIX) \ chklib.exe \
ldd$(EXE_POSTFIX) \ ldd.exe \
pedump$(EXE_POSTFIX) \ pedump.exe \
shutdown$(EXE_POSTFIX) \ shutdown.exe \
chkdsk$(EXE_POSTFIX) \ chkdsk.exe \
format$(EXE_POSTFIX) \ format.exe \
regexpl/regexpl$(EXE_POSTFIX) 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
#--- #---

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -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() * Written by EA because ReactOS hasn't yet _ui64toa()
* (it's in msvcrt.dll, and not in crtdll.dll). * (it's in msvcrt.dll, and not in crtdll.dll).
@ -7,7 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
static static
char DigitMap [36] = "0123456789abcdefghijklmnopqrstuvwxyz"; char DigitMap [] = "0123456789abcdefghijklmnopqrstuvwxyz";
char * char *
_ui64toa ( _ui64toa (

View file

@ -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_KERNEL32=$(ROS_LIB)/kernel32.a
IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a
IMPORT_USER32=$(ROS_LIB)/user32.a IMPORT_USER32=$(ROS_LIB)/user32.a
IMPORT_CRTDLL=$(ROS_LIB)/crtdll.a
depend.mak : *.h depend.mak : *.h
$(CC) \ $(CC) \
@ -65,11 +66,10 @@ CLEAN_FILES = \
$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) $(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS)
$(CC) \ $(CPP) \
-Wl,--subsystem,console \ -Wl,--subsystem,console \
-o $@ \ -o $@ \
$(IMPORT_KERNEL32) \ $(IMPORT_KERNEL32) \
$(IMPORT_CRTDLL) \
$(IMPORT_USER32) \ $(IMPORT_USER32) \
$(OBJECTS) $(OBJECTS)
$(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym

View file

@ -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)&& if ((pszMachineName)&&
((_tcslen(pszMachineName) < 3)|| ((_tcslen(pszMachineName) < 3)||

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -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 * ReactOS Project
* TList * TList
@ -6,7 +6,7 @@
* Copyright (c) 2000,2001 Emanuele Aliberti * Copyright (c) 2000,2001 Emanuele Aliberti
*/ */
#include <reactos/buildno.h> #include <reactos/buildno.h>
#define NTOS_MODE_USER #define NTOS_USER_MODE
#include <ntos.h> #include <ntos.h>
#include <stdio.h> #include <stdio.h>

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

View file

@ -7,8 +7,8 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "defines.h" #include <windows.h>
#include "reactos\resource.h" #include <reactos/resource.h>
#include "resource.h" #include "resource.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h> #include <reactos/resource.h>
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.