From: Robert Dickenson Date: Wed, 15 Jan 2003 19:55:29 +0000 (+0000) Subject: Mainly standardisation of makefiles, now support make install rules and use ros heade... X-Git-Tag: ReactOS-0.1.0~90 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=92dec86909820e91df3838002b241078895a0877 Mainly standardisation of makefiles, now support make install rules and use ros headers... svn path=/trunk/; revision=4000 --- diff --git a/rosapps/Makefile b/rosapps/Makefile index 4fbf37c9979..02119bdb5d0 100644 --- a/rosapps/Makefile +++ b/rosapps/Makefile @@ -46,11 +46,15 @@ implib: clean: $(APPS:%=%_clean) .PHONY: clean +install: $(APPS:%=%_install) +.PHONY: install + floppy: make_floppy_dirs $(APPS:%=%_floppy) dist: clean_dist_dir make_dist_dirs $(APPS:%=%_dist) .PHONY: dist + # # Applications # @@ -66,7 +70,10 @@ $(APPS:%=%_floppy): %_floppy: $(APPS:%=%_dist): %_dist: make -C $* dist -.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_floppy) $(APPS:%=%_dist) +$(APPS:%=%_install): %_install: + make -C $* install + +.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_floppy) $(APPS:%=%_dist) $(APPS:%=%_install) # @@ -107,6 +114,9 @@ else mkdir $(DIST_DIR)/apps endif +#dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \ +# $(WINE_MODULES:%=%_dist) + .PHONY: clean_dist_dir make_dist_dirs # EOF diff --git a/rosapps/calc/makefile b/rosapps/calc/makefile index 9fdb00939da..de396c73f7b 100644 --- a/rosapps/calc/makefile +++ b/rosapps/calc/makefile @@ -3,61 +3,40 @@ # # Makefile # -# Copyright (C) 2002 Robert Dickenson -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = .. - -TARGET = calc - -#BASE_CFLAGS = -DGCC -D_WIN32_IE=0x0400 -#RCFLAGS = -DGCC -D_WIN32_IE=0x0400 +PATH_TO_TOP = ../../reactos +WINE_MODE = yes -OBJS = settings.o \ - button.o \ - main.o +WINE_RC = calc -LIBS = -lgdi32 -luser32 -lkernel32 -lcomctl32 -#LIBS = -lgdi32 -luser32 -lkernel32 +TARGET_TYPE = program -all: $(TARGET).exe +TARGET_APPTYPE = console -#$(TARGET).res: $(TARGET).rc +TARGET_NAME = calc -$(TARGET).exe: $(OBJS) $(TARGET).coff - $(CC) -Wl,--subsystem,windows -o $(TARGET).exe $(OBJS) $(TARGET).coff $(LIBS) - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym +WINE_INCLUDE = ./ +#TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG -DUNICODE -D_UNICODE -main.h: resource.h +BASE_CFLAGS = -D_WIN32_IE=0x0400 -main.o: main.c main.h settings.h +RCFLAGS = -D_WIN32_IE=0x0400 -settings.o: settings.c settings.h main.h +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a \ + $(COMCTL32_TARGET).a -button.o: button.c button.h main.h +TARGET_OBJECTS = \ + settings.o \ + button.o \ + main.o +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF diff --git a/rosapps/cmd/makefile b/rosapps/cmd/makefile index 0b541ab33c0..bce74c3f083 100644 --- a/rosapps/cmd/makefile +++ b/rosapps/cmd/makefile @@ -1,55 +1,39 @@ # -# ReactOS makefile for CMD +# ReactOS CMD +# +# Makefile # -PATH_TO_TOP=.. -TARGET=cmd.exe - -all: $(TARGET) - -OBJECTS = cmd.o attrib.o alias.o batch.o beep.o call.o chcp.o choice.o \ - cls.o cmdinput.o cmdtable.o color.o console.o copy.o date.o del.o \ - delay.o dir.o dirstack.o echo.o error.o filecomp.o for.o free.o \ - goto.o history.o if.o internal.o label.o locale.o memory.o misc.o \ - move.o msgbox.o path.o pause.o prompt.o redir.o ren.o screen.o \ - set.o shift.o start.o strtoclr.o time.o timer.o title.o type.o \ - ver.o verify.o vol.o where.o window.o cmd.coff - -CLEAN_FILES = *.o cmd.exe cmd.sym cmd.coff - - -cmd.exe: $(OBJECTS) - $(CC) $(OBJECTS) -lkernel32 -lmsvcrt -luser32 -o cmd.exe - $(NM) --numeric-sort cmd.exe > cmd.sym - - -clean: $(CLEAN_FILES:%=%_clean) +PATH_TO_TOP = ../../reactos -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* +TARGET_TYPE = program -.phony: clean $(CLEAN_FILES:%=%_clean) +TARGET_APPTYPE = console +TARGET_NAME = cmd -floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%) +WINE_MODE = yes -$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(FLOPPY_DIR)\apps\$* -else - $(CP) $* $(FLOPPY_DIR)/apps/$* -endif +WINE_RC = $(TARGET_NAME) +WINE_INCLUDE = ./ -dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%) +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + msvcrt.a -$(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(PATH_TO_TOP)\$(DIST_DIR)\apps\$* -else - $(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps/$* -endif +TARGET_OBJECTS = \ + cmd.o attrib.o alias.o batch.o beep.o call.o chcp.o choice.o \ + cls.o cmdinput.o cmdtable.o color.o console.o copy.o date.o del.o \ + delay.o dir.o dirstack.o echo.o error.o filecomp.o for.o free.o \ + goto.o history.o if.o internal.o label.o locale.o memory.o misc.o \ + move.o msgbox.o path.o pause.o prompt.o redir.o ren.o screen.o \ + set.o shift.o start.o strtoclr.o time.o timer.o title.o type.o \ + ver.o verify.o vol.o where.o window.o #cmd.coff include $(PATH_TO_TOP)/rules.mak +include $(TOOLS_PATH)/helper.mk + # EOF diff --git a/rosapps/cmdutils/makefile b/rosapps/cmdutils/makefile index 9581b6078d2..4dc83644afc 100644 --- a/rosapps/cmdutils/makefile +++ b/rosapps/cmdutils/makefile @@ -31,6 +31,11 @@ y.exe: y.o y.coff $(CC) y.o -lkernel32 -lmsvcrt -o y.exe y.coff $(NM) --numeric-sort y.exe > y.sym +install: + +.phony: install + + clean: $(CLEAN_FILES:%=%_clean) $(CLEAN_FILES:%=%_clean): %_clean: diff --git a/rosapps/control/Makefile b/rosapps/control/Makefile index 5ea100bedfb..d68c810afc8 100644 --- a/rosapps/control/Makefile +++ b/rosapps/control/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2002/08/17 15:16:38 robd Exp $ +# $Id: Makefile,v 1.3 2003/01/15 19:55:28 robd Exp $ PATH_TO_TOP = ../../reactos @@ -12,7 +12,7 @@ TARGET_APPTYPE = windows TARGET_NAME = control -TARGET_SDKLIBS = roshel32.a +TARGET_SDKLIBS = shell32.a TARGET_OBJECTS = $(TARGET_NAME).o diff --git a/rosapps/dflat32/makefile b/rosapps/dflat32/makefile index a9f680c98b7..7e976f7c0cf 100644 --- a/rosapps/dflat32/makefile +++ b/rosapps/dflat32/makefile @@ -1,59 +1,43 @@ # -# ReactOS makefile for D-Flat/32 +# ReactOS D-Flat/32 +# +# Makefile # -PATH_TO_TOP=.. - -TARGET=edit.exe - -all: $(TARGET) - -OBJECTS = applicat.o barchart.o box.o button.o calendar.o checkbox.o clipbord.o \ - combobox.o config.o console.o decomp.o dfalloc.o dialbox.o dialogs.o \ - direct.o edit.o editbox.o fileopen.o helpbox.o htree.o keys.o \ - listbox.o lists.o log.o menu.o menubar.o menus.o message.o msgbox.o \ - normal.o pictbox.o popdown.o radio.o rect.o search.o slidebox.o spinbutt.o \ - statbar.o sysmenu.o text.o textbox.o video.o watch.o window.o \ - edit.coff - -CLEAN_FILES = *.o *.exe *.sym *.coff - - -edit.exe: $(OBJECTS) - $(CC) $(OBJECTS) -lkernel32 -lcrtdll -luser32 -o edit.exe - $(NM) --numeric-sort edit.exe > edit.sym +PATH_TO_TOP = ../../reactos +TARGET_TYPE = program -clean: $(CLEAN_FILES:%=%_clean) +TARGET_APPTYPE = console -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* +TARGET_NAME = edit -.phony: clean $(CLEAN_FILES:%=%_clean) +WINE_MODE = yes +WINE_RC = $(TARGET_NAME) -floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%) +WINE_INCLUDE = ./ -$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(FLOPPY_DIR)\apps\$* -else - $(CP) $* $(FLOPPY_DIR)/apps/$* -endif +#WITH_DEBUGGING=yes +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + crtdll.a -dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%) +# msvcrt.a -$(TARGET:%=../$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(PATH_TO_TOP)\$(DIST_DIR)\apps\$* -else - $(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps\$* -endif - -#WITH_DEBUGGING=yes +TARGET_OBJECTS = \ + applicat.o barchart.o box.o button.o calendar.o checkbox.o clipbord.o \ + combobox.o config.o console.o decomp.o dfalloc.o dialbox.o dialogs.o \ + direct.o edit.o editbox.o fileopen.o helpbox.o htree.o keys.o \ + listbox.o lists.o log.o menu.o menubar.o menus.o message.o msgbox.o \ + normal.o pictbox.o popdown.o radio.o rect.o search.o slidebox.o spinbutt.o \ + statbar.o sysmenu.o text.o textbox.o video.o watch.o window.o include $(PATH_TO_TOP)/rules.mak +include $(TOOLS_PATH)/helper.mk + # EOF diff --git a/rosapps/hcalc/Makefile b/rosapps/hcalc/Makefile index 12755cff2ce..576be991d91 100644 --- a/rosapps/hcalc/Makefile +++ b/rosapps/hcalc/Makefile @@ -1,56 +1,34 @@ # -# ReactOS hcalc. +# ReactOS hcalc # # Makefile # -# Copyright 1998 DJ Delorie -# Distributed under the terms of the GNU GPL -# http://www.delorie.com/store/hcalc/ -# -# Copyright (C) 2002 The ReactOS Project - -PATH_TO_TOP = .. - -TARGET = hcalc - -BASE_CFLAGS = # -DGCC -D_WIN32_IE=0x0400 - -RCFLAGS = # -DGCC -D_WIN32_IE=0x0400 - - -OBJS = hcalc.o \ - input.o - -LIBS = -lgdi32 -luser32 -lkernel32 - -all: $(TARGET).exe -$(TARGET).res: $(TARGET).rc +PATH_TO_TOP = ../../reactos -$(TARGET).exe: $(OBJS) $(TARGET).coff - $(CC) -Wl,--subsystem,windows -o $(TARGET).exe $(OBJS) $(TARGET).coff $(LIBS) - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym +TARGET_TYPE = program +TARGET_APPTYPE = console -# main.h: resource.h +TARGET_NAME = hcalc -# about.o: about.c about.h main.h +WINE_MODE = yes -# main.o: main.c main.h framewnd.h +WINE_RC = $(TARGET_NAME) -# framewnd.o: framewnd.c framewnd.h listview.h treeview.h main.h +WINE_INCLUDE = ./ -# listview.o: listview.c listview.h main.h +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a -# treeview.o: treeview.c treeview.h main.h - -# debug.o: debug.c debug.h main.h +TARGET_OBJECTS = \ + hcalc.o \ + input.o +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF diff --git a/rosapps/mc/Makefile b/rosapps/mc/Makefile index b937e0c2077..b5e2956a405 100644 --- a/rosapps/mc/Makefile +++ b/rosapps/mc/Makefile @@ -1,30 +1,112 @@ -include ../rules.mak +# +# ReactOS mc +# +# Makefile +# -TARGET_OS=NT +PATH_TO_TOP = ../../reactos -#CC=gcc -LINK=$(CC) -lmsvcrt -OBJ_SUFFIX=o -OBJ_PLACE=-o -EXE_PLACE=-o +TARGET_TYPE = program -# ---- Compiler-specific optional stuff -MC_MISC_CFLAGS= -OBJS_DIR=release -EXTRA_MC_SRCS= -SPECIFIC_DEFINES= -SPECIFIC_MC_CFLAGS=-O2 $(MC_MISC_CFLAGS) -SPECIFIC_MC_LFLAGS_EXTRA= -SPECIFIC_SLANG_CFLAGS=$(SPECIFIC_MC_CFLAGS) -SPECIFIC_MCEDIT_CFLAGS=$(SPECIFIC_MC_CFLAGS) +TARGET_OS = NT -# ---- Compiler independent defines -include Makefile.PC +TARGET_APPTYPE = console -# ---- Linkers are very compiler-specific +TARGET_NAME = mc -SPECIFIC_MC_LFLAGS=$(SPECIFIC_MC_LFLAGS_EXTRA) -MC_LIBS= # -lintl +TARGET_CFLAGS = -I./pc -I./slang -DMC_$(TARGET_OS) -DHAVE_CONFIG_H -$(MC_EXE): $(OBJS) $(MCEDIT_OBJS) $(SLANG_OBJS) - $(LINK) $(EXE_PLACE) $(MC_EXE) $(SPECIFIC_MC_LFLAGS) $+ $(MC_LIBS) +WINE_MODE = yes + +WINE_RC = $(TARGET_NAME) + +WINE_INCLUDE = ./ + +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a + +MC_OBJS = \ + ./src/terms.o \ + ./src/user.o \ + ./src/file.o \ + ./src/listmode.o \ + ./src/cmd.o \ + ./src/command.o \ + ./src/help.o \ + ./src/menu.o \ + ./src/view.o \ + ./src/dir.o \ + ./src/info.o \ + ./src/widget.o \ + ./src/option.o \ + ./src/dlg.o \ + ./src/panelize.o \ + ./src/profile.o \ + ./src/util.o \ + ./src/dialog.o \ + ./src/ext.o \ + ./src/color.o \ + ./src/layout.o \ + ./src/setup.o \ + ./src/regex.o \ + ./src/hotlist.o \ + ./src/tree.o \ + ./src/win.o \ + ./src/complete.o \ + ./src/find.o \ + ./src/wtools.o \ + ./src/boxes.o \ + ./src/background.o \ + ./src/main.o \ + ./src/popt.o \ + ./src/text.o \ + ./src/screen.o + +PC_OBJS= \ + ./pc/slint_pc.o \ + ./pc/chmod.o \ + ./pc/drive.o + +NT_OBJS = \ + ./pc/cons_nt.o \ + ./pc/dirent_nt.o \ + ./pc/key_nt.o \ + ./pc/util_win32.o \ + ./pc/util_winnt.o \ + ./pc/util_nt.o + +SLANG_NT = slw32tty.o + +SLANG_OS2 = slos2tty.o + +SLANG_OBJS = \ + ./slang/slerr.o \ + ./slang/slgetkey.o \ + ./slang/slsmg.o \ + ./slang/slvideo.o \ + ./slang/$(SLANG_$(TARGET_OS)) + +MCEDIT_OBJS = \ + ./edit/edit.o \ + ./edit/editcmd.o \ + ./edit/editdraw.o \ + ./edit/editmenu.o \ + ./edit/editoptions.o \ + ./edit/editwidget.o \ + ./edit/syntax.o \ + ./edit/wordproc.o + +TARGET_OBJECTS = \ + $(MC_OBJS) \ + $(PC_OBJS) \ + $(NT_OBJS) \ + $(SLANG_OBJS) \ + $(MCEDIT_OBJS) \ + + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +# EOF diff --git a/rosapps/mc/edit/.cvsignore b/rosapps/mc/edit/.cvsignore new file mode 100644 index 00000000000..5761abcfdf0 --- /dev/null +++ b/rosapps/mc/edit/.cvsignore @@ -0,0 +1 @@ +*.o diff --git a/rosapps/mc/pc/.cvsignore b/rosapps/mc/pc/.cvsignore new file mode 100644 index 00000000000..5761abcfdf0 --- /dev/null +++ b/rosapps/mc/pc/.cvsignore @@ -0,0 +1 @@ +*.o diff --git a/rosapps/mc/slang/.cvsignore b/rosapps/mc/slang/.cvsignore new file mode 100644 index 00000000000..5761abcfdf0 --- /dev/null +++ b/rosapps/mc/slang/.cvsignore @@ -0,0 +1 @@ +*.o diff --git a/rosapps/mc/src/.cvsignore b/rosapps/mc/src/.cvsignore new file mode 100644 index 00000000000..5761abcfdf0 --- /dev/null +++ b/rosapps/mc/src/.cvsignore @@ -0,0 +1 @@ +*.o diff --git a/rosapps/notepad/makefile b/rosapps/notepad/makefile index 1ccd626d822..c4c5f4c32be 100644 --- a/rosapps/notepad/makefile +++ b/rosapps/notepad/makefile @@ -3,54 +3,38 @@ # # Makefile # -# Copyright (C) 2002 Robert Dickenson -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = .. -TARGET = notepad +PATH_TO_TOP = ../../reactos -BASE_CFLAGS = -D_WIN32_IE=0x0400 +TARGET_TYPE = program -RCFLAGS = -D_WIN32_IE=0x0400 +TARGET_APPTYPE = console -OBJS = framewnd.o \ - main.o +TARGET_NAME = notepad -LIBS = -lgdi32 -luser32 -lkernel32 -lcomctl32 -lcomdlg32 +TARGET_CFLAGS = -D_WIN32_IE=0x0400 # -DUNICODE -D_UNICODE -all: $(TARGET).exe +TARGET_RCFLAGS = -D_WIN32_IE=0x0400 -$(TARGET).res: $(TARGET).rc +WINE_MODE = yes -$(TARGET).exe: $(OBJS) $(TARGET).coff - $(CC) -Wl,--subsystem,windows -o $(TARGET).exe $(OBJS) $(TARGET).coff $(LIBS) - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym +WINE_RC = $(TARGET_NAME) +WINE_INCLUDE = ./ -main.o: main.c main.h framewnd.h resource.h +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a \ + $(COMCTL32_TARGET).a \ + $(COMDLG32_TARGET).a -framewnd.o: framewnd.c framewnd.h main.h resource.h +TARGET_OBJECTS = \ + framewnd.o \ + main.o +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF diff --git a/rosapps/notevil/makefile b/rosapps/notevil/makefile index 814dbfccf24..3f54023b73a 100644 --- a/rosapps/notevil/makefile +++ b/rosapps/notevil/makefile @@ -1,60 +1,27 @@ -# $Id: makefile,v 1.5 2001/10/16 21:02:02 ea Exp $ # -# ReactOS makefile for notevil -# Compiler: egcs 1.1.2 +# ReactOS notevil +# +# Makefile # -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 - -CLEAN_FILES = *.o $(TARGET).exe $(TARGET).sym $(TARGET).coff - -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) - -$(TARGET).exe: $(OBJECTS) - $(CC) $(OBJECTS) \ - -o $(TARGET).exe \ - -lkernel32 \ - -luser32 \ - -lmsvcrt - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym -$(TARGET).coff: $(TARGET).rc - $(RC) $(RFLAGS) $(TARGET).rc $(TARGET).coff +PATH_TO_TOP = ../../reactos -$(TARGET).o: $(TARGET).c resource.h +TARGET_TYPE = program -floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%) +TARGET_APPTYPE = console -$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(FLOPPY_DIR)\apps\$* -else - $(CP) $* $(FLOPPY_DIR)/apps/$* -endif +TARGET_NAME = notevil +#TARGET_CFLAGS = -DUNICODE -D_UNICODE -dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%) +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a -$(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* ..\$(DIST_DIR)\apps\$* -else - $(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps/$* -endif +TARGET_OBJECTS = $(TARGET_NAME).o include $(PATH_TO_TOP)/rules.mak +include $(TOOLS_PATH)/helper.mk + # EOF diff --git a/rosapps/regedit/Makefile b/rosapps/regedit/Makefile index acb97fcb69d..8375d5ad9d1 100644 --- a/rosapps/regedit/Makefile +++ b/rosapps/regedit/Makefile @@ -3,32 +3,34 @@ # # Makefile # -# Copyright (C) 2002 Robert Dickenson -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = .. -TARGET = regedit +PATH_TO_TOP = ../../reactos + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = regedit -BASE_CFLAGS = -D_WIN32_IE=0x0400 +#TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG -DUNICODE -D_UNICODE +#TARGET_CFLAGS = -D_WIN32_IE=0x0400 +#TARGET_RCFLAGS = -D_WIN32_IE=0x0400 -RCFLAGS = -D_WIN32_IE=0x0400 +WINE_MODE = yes -OBJS = about.o \ +WINE_RC = $(TARGET_NAME) + +WINE_INCLUDE = ./ + +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a \ + $(COMCTL32_TARGET).a \ + $(COMDLG32_TARGET).a + +TARGET_OBJECTS = \ + about.o \ childwnd.o \ framewnd.o \ hex_str.o \ @@ -39,38 +41,8 @@ OBJS = about.o \ treeview.o \ trace.o -LIBS = -lgdi32 -luser32 -lkernel32 -lcomctl32 -lcomdlg32 - -all: $(TARGET).exe - -$(TARGET).res: $(TARGET).rc - -$(TARGET).exe: $(OBJS) $(TARGET).coff - $(CC) -Wl,--subsystem,windows -o $(TARGET).exe $(OBJS) $(TARGET).coff $(LIBS) - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym - - -main.h: resource.h - -main.o: main.c main.h framewnd.h - -framewnd.o: framewnd.c framewnd.h listview.h treeview.h main.h - -childwnd.o: childwnd.c childwnd.h main.h - -listview.o: listview.c listview.h main.h - -treeview.o: treeview.c treeview.h main.h - -about.o: about.c about.h main.h - -debug.o: debug.c debug.h main.h - +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF diff --git a/rosapps/regedit/listview.c b/rosapps/regedit/listview.c index fba22f83feb..df61d98d7bb 100644 --- a/rosapps/regedit/listview.c +++ b/rosapps/regedit/listview.c @@ -28,6 +28,8 @@ #include #include +#include "commctrl.h" + #include #include "main.h" #include "listview.h" diff --git a/rosapps/regedt32/Makefile b/rosapps/regedt32/Makefile index 244d1468413..1e61150500c 100644 --- a/rosapps/regedt32/Makefile +++ b/rosapps/regedt32/Makefile @@ -3,69 +3,43 @@ # # Makefile # -# Copyright (C) 2002 Robert Dickenson -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = .. -TARGET = regedt32 +PATH_TO_TOP = ../../reactos + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = regedt32 BASE_CFLAGS = -DGCC -D_WIN32_IE=0x0400 RCFLAGS = -DGCC -D_WIN32_IE=0x0400 +WINE_MODE = yes + +WINE_RC = $(TARGET_NAME) + +WINE_INCLUDE = ./ -OBJS = framewnd.o \ +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a \ + advapi32.a \ + $(COMCTL32_TARGET).a \ + $(COMDLG32_TARGET).a + +TARGET_OBJECTS = \ + framewnd.o \ childwnd.o \ listview.o \ treeview.o \ settings.o \ main.o -LIBS = -lgdi32 -luser32 -lkernel32 -ladvapi32 -lcomctl32 -lcomdlg32 - -all: $(TARGET).exe - -$(TARGET).res: $(TARGET).rc - -$(TARGET).exe: $(OBJS) $(TARGET).coff - $(CC) -Wl,--subsystem,windows -o $(TARGET).exe $(OBJS) $(TARGET).coff $(LIBS) - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym - - -main.h: resource.h - -main.o: main.c main.h framewnd.h - -framewnd.o: framewnd.c framewnd.h listview.h treeview.h main.h - -childwnd.o: childwnd.c childwnd.h main.h - -listview.o: listview.c listview.h main.h - -treeview.o: treeview.c treeview.h main.h - -settings.o: settings.c settings.h main.h - +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF diff --git a/rosapps/regedt32/listview.c b/rosapps/regedt32/listview.c index 47d64bff236..c1a7e24de2b 100644 --- a/rosapps/regedt32/listview.c +++ b/rosapps/regedt32/listview.c @@ -39,6 +39,23 @@ #include "listview.h" +#define LVM_GETITEMTEXTA (LVM_FIRST + 45) +#define LVM_GETITEMTEXTW (LVM_FIRST + 115) + +#ifdef UNICODE +#define LVM_GETITEMTEXT LVM_GETITEMTEXTW +#else +#define LVM_GETITEMTEXT LVM_GETITEMTEXTA +#endif + +#define ListView_GetItemText(hwndLV, i, iSubItem_, pszText_, cchTextMax_) \ +{ LV_ITEM _ms_lvi;\ + _ms_lvi.iSubItem = iSubItem_;\ + _ms_lvi.cchTextMax = cchTextMax_;\ + _ms_lvi.pszText = pszText_;\ + SNDMSG((hwndLV), LVM_GETITEMTEXT, (WPARAM)i, (LPARAM)(LV_ITEM FAR *)&_ms_lvi);\ +} + //////////////////////////////////////////////////////////////////////////////// // Global and Local Variables: // diff --git a/rosapps/regedt32/main.h b/rosapps/regedt32/main.h index 4f5c9568bc0..9d1dc4b4857 100644 --- a/rosapps/regedt32/main.h +++ b/rosapps/regedt32/main.h @@ -89,6 +89,7 @@ extern TCHAR szFrameClass[]; extern TCHAR szChildClass[]; #if __MINGW32_MAJOR_VERSION == 1 +/* typedef struct tagNMITEMACTIVATE{ NMHDR hdr; int iItem; @@ -100,6 +101,7 @@ typedef struct tagNMITEMACTIVATE{ LPARAM lParam; UINT uKeyFlags; } NMITEMACTIVATE, FAR *LPNMITEMACTIVATE; + */ #endif #ifdef __cplusplus diff --git a/rosapps/rules.mak b/rosapps/rules.mak index 48121500be0..1530cf9f178 100644 --- a/rosapps/rules.mak +++ b/rosapps/rules.mak @@ -49,6 +49,11 @@ DIST_DIR = dist SEP = \$($EMPTY_VAR) endif +# Set INSTALL_DIR to default value if not already set +# ifeq ($(INSTALL_DIR),) +INSTALL_DIR = $(PATH_TO_TOP)/reactos +# endif + # # Create variables for all the compiler tools # diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile index f96fa617970..04a6c4cacc4 100644 --- a/rosapps/sysutils/makefile +++ b/rosapps/sysutils/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.12 2003/01/07 18:16:44 robd Exp $ +# $Id: makefile,v 1.13 2003/01/15 19:53:01 robd Exp $ # # ReactOS System Utilities # @@ -135,6 +135,10 @@ regexpl/regexpl.exe: #--- +install: + +.phony: install + CLEAN_FILES = *.o *.exe *.sym clean: $(CLEAN_FILES:%=%_clean) diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile index f6b31400492..bbae3ed2741 100644 --- a/rosapps/sysutils/regexpl/Makefile +++ b/rosapps/sysutils/regexpl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 2002/09/09 22:36:40 sedwards Exp $ +# $Id: Makefile,v 1.9 2003/01/15 19:53:01 robd Exp $ # # ReactOS makefile for RegExpl # @@ -22,9 +22,9 @@ IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a IMPORT_USER32=$(ROS_LIB)/user32.a -depend.mak : *.h - $(CC) \ - -MM *.cpp *.c > $@ +#depend.mak : *.h +# $(CC) \ +# -MM *.cpp *.c > $@ OBJECTS = \ ArgumentParser.o \ @@ -65,14 +65,19 @@ CLEAN_FILES = \ depend.mak -$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) - $(CPP) \ - -Wl,--subsystem,console \ - -o $@ \ - $(IMPORT_KERNEL32) \ - $(IMPORT_USER32) \ - $(OBJECTS) - $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym +$(TARGET_NAME).exe: $(OBJECTS) $(TARGET_NAME).coff + $(CC) -Wl,--subsystem,console -o $(TARGET_NAME).exe $(OBJECTS) $(TARGET_NAME).coff $(IMPORT_KERNEL32) $(IMPORT_USER32) + $(NM) --numeric-sort $(TARGET_NAME).exe > $(TARGET_NAME).sym + + +#$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) +# $(CPP) \ +# -Wl,--subsystem,console \ +# -o $@ \ +# $(IMPORT_KERNEL32) \ +# $(IMPORT_USER32) \ +# $(OBJECTS) +# $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym clean: $(CLEAN_FILES:%=%_clean) @@ -101,5 +106,5 @@ else $(CP) $* ../$(DIST_DIR)/apps\$* endif -# EOF +# EOF diff --git a/rosapps/sysutils/tlist/Makefile b/rosapps/sysutils/tlist/Makefile index 0d9b5da8bba..f774028de35 100644 --- a/rosapps/sysutils/tlist/Makefile +++ b/rosapps/sysutils/tlist/Makefile @@ -1,69 +1,23 @@ -# $Id: Makefile,v 1.1 2001/11/04 21:53:20 ea Exp $ # -# ReactOS makefile for TList +# ReactOS tlist +# +# Makefile # -PATH_TO_TOP=../.. - -include $(PATH_TO_TOP)/rules.mak - -TARGET_NAME=tlist - -all: $(TARGET_NAME)$(EXE_POSTFIX) - -ROS_DIR=../$(PATH_TO_TOP)/reactos -ROS_INC=$(ROS_DIR)/include -ROS_LIB=$(ROS_DIR)/dk/w32/lib -IMPORT_NTDLL=$(ROS_LIB)/ntdll.a -IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a -IMPORT_CRTDLL=$(ROS_LIB)/msvcrt.a - - -BASE_CFLAGS=-I$(ROS_INC) - -OBJECTS = \ - tlist.o \ - $(TARGET_NAME).coff - -CLEAN_FILES = \ - *.o \ - $(TARGET_NAME)$(EXE_POSTFIX) \ - $(TARGET_NAME).sym \ - $(TARGET_NAME).coff - -$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) - $(CC) \ - -Wl,--subsystem,console \ - -o $@ \ - $(OBJECTS) \ - $(IMPORT_NTDLL) - $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym - -clean: $(CLEAN_FILES:%=%_clean) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* +PATH_TO_TOP = ../../../reactos -.phony: clean $(CLEAN_FILES:%=%_clean) +TARGET_TYPE = program +TARGET_APPTYPE = console -floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%) +TARGET_NAME = tlist -$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(FLOPPY_DIR)\apps\$* -else - $(CP) $* $(FLOPPY_DIR)/apps/$* -endif +TARGET_SDKLIBS = kernel32.a user32.a ntdll.a +TARGET_OBJECTS = $(TARGET_NAME).o -dist: $(TARGET:%=../$(DIST_DIR)/apps/%) +include $(PATH_TO_TOP)/rules.mak -$(TARGET:%=../$(DIST_DIR)/apps/%): ../$(DIST_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* ..\$(DIST_DIR)\apps\$* -else - $(CP) $* ../$(DIST_DIR)/apps\$* -endif +include $(TOOLS_PATH)/helper.mk # EOF - diff --git a/rosapps/taskmgr/makefile b/rosapps/taskmgr/makefile index 9bc4bfa2a04..c546021a690 100644 --- a/rosapps/taskmgr/makefile +++ b/rosapps/taskmgr/makefile @@ -3,34 +3,34 @@ # # Makefile # -# Copyright (C) 1999 - 2001 Brian Palmer -# Copyright (C) 2002 Robert Dickenson -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = .. -TARGET = taskmgr +PATH_TO_TOP = ../../reactos + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = taskmgr + +#TARGET_CFLAGS = -DDBG -D_WIN32_IE=0x0400 +#TARGET_RCFLAGS = -D_WIN32_IE=0x0400 + +WINE_MODE = yes -BASE_CFLAGS = -DGCC -D_WIN32_IE=0x0400 +WINE_RC = $(TARGET_NAME) -RCFLAGS = -DGCC -D_WIN32_IE=0x0400 +WINE_INCLUDE = ./ +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a \ + $(COMCTL32_TARGET).a -OBJS = about.o \ +TARGET_GCCLIBS = stdc++ + +TARGET_OBJECTS = \ + about.o \ affinity.o \ applpage.o \ column.o \ @@ -49,57 +49,8 @@ OBJS = about.o \ taskmgr.o \ graphctl.o -LIBS = -lgdi32 -luser32 -lkernel32 -lcomctl32 - -all: taskmgr.exe - -taskmgr.res: taskmgr.rc - -taskmgr.exe: $(OBJS) taskmgr.coff - $(CPP) -Wl,--subsystem,windows -o taskmgr.exe $(OBJS) taskmgr.coff $(LIBS) - $(NM) --numeric-sort taskmgr.exe > taskmgr.sym - - -about.o: about.c about.h resource.h - -affinity.o: affinity.c affinity.h - -applpage.o: applpage.c applpage.h procpage.h taskmgr.h resource.h - -column.o: column.c column.h resource.h - -debug.o: debug.c debug.h - -endproc.o: endproc.c endproc.h - -font.o: font.c font.h - -graph.o: graph.c graph.h resource.h - -graphctl.o: graphctl.cpp graphctl.h resource.h - -optnmenu.o: optnmenu.c optnmenu.h resource.h - -perfdata.o: perfdata.c perfdata.h - -perfpage.o: perfpage.cpp perfpage.h perfdata.h graphctl.h graph.h taskmgr.h resource.h - -priority.o: priority.c priority.h - -procpage.o: procpage.c procpage.h perfdata.h column.h proclist.h taskmgr.h resource.h - -proclist.o: proclist.c proclist.h - -run.o: run.c run.h - -trayicon.o: trayicon.c trayicon.h resource.h - -taskmgr.o: taskmgr.c taskmgr.h resource.h +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) taskmgr.exe - - $(RM) taskmgr.sym - - $(RM) taskmgr.coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF diff --git a/rosapps/taskmgr/taskmgr.c b/rosapps/taskmgr/taskmgr.c index df04165d02d..d1767c8c148 100644 --- a/rosapps/taskmgr/taskmgr.c +++ b/rosapps/taskmgr/taskmgr.c @@ -98,7 +98,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, #define _USE_CMD_MAP #ifdef _USE_CMD_MAP -#define BEGIN_CMD_MAP(a) switch( ##a ) { +//#define BEGIN_CMD_MAP(a) switch( ##a ) { +#define BEGIN_CMD_MAP(a) switch( a ) { #define CMD_MAP_ENTRY(a, b) case a: b(); break; #define END_CMD_MAP(a) } diff --git a/rosapps/taskmgr/taskmgr.h b/rosapps/taskmgr/taskmgr.h index d90a3e194d3..9f56248bcc9 100644 --- a/rosapps/taskmgr/taskmgr.h +++ b/rosapps/taskmgr/taskmgr.h @@ -49,6 +49,17 @@ typedef struct _IO_COUNTERS { #define HDM_GETORDERARRAY (HDM_FIRST+19) // TODO: FIX ME #endif +//#define LVM_REDRAWITEMS (LVM_FIRST + 21) +#define ListView_RedrawItems(hwndLV, iFirst, iLast) \ + (BOOL)SNDMSG((hwndLV), LVM_REDRAWITEMS, (WPARAM)(int)iFirst, (LPARAM)(int)iLast) + +//#if (_WIN32_IE >= 0x0300) +//#define LVM_GETHEADER (LVM_FIRST + 31) +#define ListView_GetHeader(hwnd)\ + (HWND)SNDMSG((hwnd), LVM_GETHEADER, 0, 0L) +//#endif + + #endif #include "resource.h" diff --git a/rosapps/taskmgr/taskmgr.rc b/rosapps/taskmgr/taskmgr.rc index 6da447dce6b..563a7c3e8da 100644 --- a/rosapps/taskmgr/taskmgr.rc +++ b/rosapps/taskmgr/taskmgr.rc @@ -11,7 +11,7 @@ #ifdef __GNUC__ #include //#include -#include +//#include #else #include "windows.h" #endif diff --git a/rosapps/welcome/makefile b/rosapps/welcome/makefile index 9d92dea3ff3..6a2a43da96e 100644 --- a/rosapps/welcome/makefile +++ b/rosapps/welcome/makefile @@ -29,6 +29,8 @@ clean: - $(RM) *.coff - $(RM) *.exe +install: + include $(PATH_TO_TOP)/rules.mak # EOF diff --git a/rosapps/winfile/Makefile b/rosapps/winfile/Makefile index 4559b682c2d..2fefc36057a 100644 --- a/rosapps/winfile/Makefile +++ b/rosapps/winfile/Makefile @@ -3,37 +3,40 @@ # # Makefile # -# Copyright (C) 2002 Robert Dickenson -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = .. -TARGET = winfile +PATH_TO_TOP = ../../reactos + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = winfile -BASE_CFLAGS = -D_WIN32_IE=0x0400 +TARGET_CFLAGS = -D_WIN32_IE=0x0400 -RCFLAGS = -D_WIN32_IE=0x0400 +TARGET_RCFLAGS = -D_WIN32_IE=0x0400 -OBJS = about.o \ +WINE_MODE = yes + +WINE_RC = $(TARGET_NAME) + +WINE_INCLUDE = ./ + +TARGET_SDKLIBS = \ + kernel32.a \ + user32.a \ + gdi32.a \ + advapi32.a \ + version.a \ + $(COMCTL32_TARGET).a \ + $(COMDLG32_TARGET).a + +TARGET_OBJECTS = \ + about.o \ childwnd.o \ debug.o \ dialogs.o \ drivebar.o \ - draw.o \ entries.o \ framewnd.o \ listview.o \ @@ -49,42 +52,8 @@ OBJS = about.o \ utils.o \ worker.o -LIBS = -lgdi32 -luser32 -lkernel32 -ladvapi32 -lcomctl32 -lcomdlg32 -lversion - -all: $(TARGET).exe - -$(TARGET).res: $(TARGET).rc - -$(TARGET).exe: $(OBJS) $(TARGET).coff - $(CC) -Wl,--subsystem,windows -o $(TARGET).exe $(OBJS) $(TARGET).coff $(LIBS) - $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym - - -main.h: resource.h Makefile - -about.o: about.c about.h main.h - -main.o: main.c main.h childwnd.h framewnd.h main.h - -childwnd.o: childwnd.c childwnd.h main.h - -framewnd.o: framewnd.c framewnd.h main.h - -debug.o: debug.c debug.h main.h - -font.o: font.c font.h main.h - -run.o: run.c run.h main.h - -setttings.o: setttings.c setttings.h main.h - -$(TARGET).o: $(TARGET).c $(TARGET).h main.h Makefile - +include $(PATH_TO_TOP)/rules.mak -clean: - - $(RM) $(OBJS) - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff +include $(TOOLS_PATH)/helper.mk -include $(PATH_TO_TOP)/rules.mak +# EOF