Support latest MinGW releases.
Support building on linux.
svn path=/trunk/; revision=3454
# Global makefile for the ROSAPPS package
#
-#
-# Select your host
-#
-#HOST = djgpp-msdos
-HOST = mingw32-windows
-
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 \
- cmdutils\touch \
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 \
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
//Microsoft Developer Studio generated resource script.
-#include "../../reactos/include/defines.h"
+#include <windows.h>"
#include "../../reactos/include/reactos/resource.h"
#include "cmdver.h"
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//#error "__STDC__ defined"
//#endif
-#include <sys\utime.h>
+#include <sys/utime.h>
#include <io.h>
#include <fcntl.h>
#include <getopt.h>
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
background = SelectBackground(wnd);
}
-/* EOF */
\ No newline at end of file
+/* EOF */
#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>
CONTROL(BUTTON, " ~Next >>", 30, 0, 1, 8, ID_NEXT)
ENDDB
-/* EOF */
\ No newline at end of file
+/* EOF */
-/* $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
return FALSE;
}
-/* EOF */
\ No newline at end of file
+/* EOF */
#endif
-/* EOF */
\ No newline at end of file
+/* EOF */
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+include ../rules.mak
+
TARGET_OS=NT
-CC=gcc
-LINK=gcc -s
+#CC=gcc
+LINK=$(CC) -lmsvcrt
OBJ_SUFFIX=o
OBJ_PLACE=-o
EXE_PLACE=-o
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-/* $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 <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
//Microsoft Developer Studio generated resource script.
#HOST = mingw32-windows
#HOST = mingw32-linux
#
+
# Windows is default host environment
ifeq ($(HOST),)
HOST = mingw32-windows
# Choose various options
#
ifeq ($(HOST),mingw32-linux)
-PREFIX = i586-mingw32-
+PREFIX = mingw32-
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
+SEP = /
endif
FLOPPY_DIR = A:
# DIST_DIR should be relative from the top of the tree
DIST_DIR = dist
+SEP = \$($EMPTY_VAR)
endif
#
LEAN_AND_MEAN_DEFINE =
endif
+CPP = $(PREFIX)g++
CC = $(PREFIX)gcc
NATIVE_CC = gcc
CFLAGS = \
OBJCOPY = $(PREFIX)objcopy
STRIP = $(PREFIX)strip
AS = $(PREFIX)gcc -c -x assembler-with-cpp
-CPP = $(PREFIX)cpp
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
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CPP) $(CFLAGS) -c $< -o $@
%.o: %.cc
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CPP) $(CFLAGS) -c $< -o $@
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
%.o: %.asm
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-# $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
#
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=\
- 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)
# By Nedko Arnaoudov
-regexpl/regexpl$(EXE_POSTFIX):
+regexpl/regexpl.exe:
make -C regexpl
#---
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-/* $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).
#include <stdlib.h>
static
-char DigitMap [36] = "0123456789abcdefghijklmnopqrstuvwxyz";
+char DigitMap [] = "0123456789abcdefghijklmnopqrstuvwxyz";
char *
_ui64toa (
-# $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
#
-include ../../rules.mak
+PATH_TO_TOP = ../..
+
+include $(PATH_TO_TOP)/rules.mak
TARGET_NAME=regexpl
-all: $(TARGET_NAME)$(EXE_POSTFIX)
+all: $(TARGET_NAME).exe
include depend.mak
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) \
$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS)
- $(CC) \
+ $(CPP) \
-Wl,--subsystem,console \
-o $@ \
$(IMPORT_KERNEL32) \
- $(IMPORT_CRTDLL) \
$(IMPORT_USER32) \
$(OBJECTS)
$(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym
-/* $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
*
m_hKey = NULL;
}
-HRESULT CRegistryKey::InitRoot(const TCHAR *pszMachineName = NULL)
+HRESULT CRegistryKey::InitRoot(const TCHAR *pszMachineName)
{
if ((pszMachineName)&&
((_tcslen(pszMachineName) < 3)||
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-/* $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
* 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 <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "defines.h"
-#include "reactos\resource.h"
+#include <windows.h>
+#include <reactos/resource.h>
#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
//Microsoft Developer Studio generated resource script.
-#include <defines.h>
+#include <windows.h>
#include <reactos/resource.h>
//Microsoft Developer Studio generated resource script.