From e83e16de9e00a596b06d9c970039fd4fbfbfe703 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 10 Jul 2007 10:29:19 +0000 Subject: [PATCH] removed obsolete makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/makebase.b32 | 456 --------------------- src/msw/makebase.vc | 264 ------------- src/msw/makefile.mic | 356 ----------------- src/msw/makefile.sl | 914 ------------------------------------------- 4 files changed, 1990 deletions(-) delete mode 100644 src/msw/makebase.b32 delete mode 100644 src/msw/makebase.vc delete mode 100644 src/msw/makefile.mic delete mode 100644 src/msw/makefile.sl diff --git a/src/msw/makebase.b32 b/src/msw/makebase.b32 deleted file mode 100644 index 9cb1bea264..0000000000 --- a/src/msw/makebase.b32 +++ /dev/null @@ -1,456 +0,0 @@ - - - - -# This file was automatically generated by tmake -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! - -# -# File: makebase.b32 -# Author: Julian Smart -# Created: 1998 -# Updated: Michael Fielding, 2002 -# Copyright: -# -# "%W% %G%" -# -# Makefile : Builds wxWindows library wxbase.lib for MS Windows, -# and Borland C++ (32-bit). - -# BCCDIR now defined in ../makeb32.env - -!if "$(WXWIN)" == "" -!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx -!endif - -WXDIR = $(WXWIN) -THISDIR = $(WXDIR)\src\msw - -# Set all these to 1 if you want to build a dynamic library -!if "$(DLL)" == "1" -WXMAKINGDLL=1 -WXBUILDDLL=1 -!endif - -wxUSE_GUI=0 - -!include $(WXDIR)\src\makeb32.env - -PERIPH_LIBS= -PERIPH_TARGET=zlib regex $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_zlib clean_regex $(PERIPH_CLEAN_TARGET) - -!if "$(DLL)" == "0" -DUMMY=dummy -!else -DUMMY=dummydll -LIBS= cw32mti import32 ole2w32 odbc32 zlib regex -!endif - -LIBTARGET=$(WXLIB) - -GENDIR=..\generic -COMMDIR=..\common -HTMLDIR=..\html -OLEDIR=.\ole -MSWDIR=. - -DOCDIR = $(WXDIR)\docs - -COMMONOBJS = \ - $(OBJ_PATH)\appbase.obj \ - $(OBJ_PATH)\clntdata.obj \ - $(OBJ_PATH)\cmdline.obj \ - $(OBJ_PATH)\config.obj \ - $(OBJ_PATH)\datetime.obj \ - $(OBJ_PATH)\datstrm.obj \ - $(OBJ_PATH)\db.obj \ - $(OBJ_PATH)\dbtable.obj \ - $(OBJ_PATH)\dircmn.obj \ - $(OBJ_PATH)\dynarray.obj \ - $(OBJ_PATH)\dynlib.obj \ - $(OBJ_PATH)\dynload.obj \ - $(OBJ_PATH)\encconv.obj \ - $(OBJ_PATH)\event.obj \ - $(OBJ_PATH)\extended.obj \ - $(OBJ_PATH)\ffile.obj \ - $(OBJ_PATH)\file.obj \ - $(OBJ_PATH)\fileconf.obj \ - $(OBJ_PATH)\filefn.obj \ - $(OBJ_PATH)\filename.obj \ - $(OBJ_PATH)\filesys.obj \ - $(OBJ_PATH)\fmapbase.obj \ - $(OBJ_PATH)\fs_inet.obj \ - $(OBJ_PATH)\fs_mem.obj \ - $(OBJ_PATH)\fs_zip.obj \ - $(OBJ_PATH)\ftp.obj \ - $(OBJ_PATH)\hash.obj \ - $(OBJ_PATH)\hashmap.obj \ - $(OBJ_PATH)\http.obj \ - $(OBJ_PATH)\intl.obj \ - $(OBJ_PATH)\ipcbase.obj \ - $(OBJ_PATH)\list.obj \ - $(OBJ_PATH)\log.obj \ - $(OBJ_PATH)\longlong.obj \ - $(OBJ_PATH)\memory.obj \ - $(OBJ_PATH)\mimecmn.obj \ - $(OBJ_PATH)\module.obj \ - $(OBJ_PATH)\msgout.obj \ - $(OBJ_PATH)\mstream.obj \ - $(OBJ_PATH)\object.obj \ - $(OBJ_PATH)\process.obj \ - $(OBJ_PATH)\protocol.obj \ - $(OBJ_PATH)\regex.obj \ - $(OBJ_PATH)\sckaddr.obj \ - $(OBJ_PATH)\sckfile.obj \ - $(OBJ_PATH)\sckipc.obj \ - $(OBJ_PATH)\sckstrm.obj \ - $(OBJ_PATH)\socket.obj \ - $(OBJ_PATH)\stopwatch.obj \ - $(OBJ_PATH)\strconv.obj \ - $(OBJ_PATH)\stream.obj \ - $(OBJ_PATH)\string.obj \ - $(OBJ_PATH)\sysopt.obj \ - $(OBJ_PATH)\textbuf.obj \ - $(OBJ_PATH)\textfile.obj \ - $(OBJ_PATH)\tokenzr.obj \ - $(OBJ_PATH)\txtstrm.obj \ - $(OBJ_PATH)\unzip.obj \ - $(OBJ_PATH)\url.obj \ - $(OBJ_PATH)\utilscmn.obj \ - $(OBJ_PATH)\variant.obj \ - $(OBJ_PATH)\wfstream.obj \ - $(OBJ_PATH)\wxchar.obj \ - $(OBJ_PATH)\zipstrm.obj \ - $(OBJ_PATH)\zstream.obj \ - $(OBJ_PATH)\init.obj - -MSWOBJS = $(OBJ_PATH)\basemsw.obj \ - $(OBJ_PATH)\dde.obj \ - $(OBJ_PATH)\dir.obj \ - $(OBJ_PATH)\gsocket.obj \ - $(OBJ_PATH)\gsockmsw.obj \ - $(OBJ_PATH)\main.obj \ - $(OBJ_PATH)\mimetype.obj \ - $(OBJ_PATH)\mslu.obj \ - $(OBJ_PATH)\regconf.obj \ - $(OBJ_PATH)\registry.obj \ - $(OBJ_PATH)\snglinst.obj \ - $(OBJ_PATH)\thread.obj \ - $(OBJ_PATH)\utils.obj \ - $(OBJ_PATH)\utilsexc.obj \ - $(OBJ_PATH)\volume.obj - -OBJECTS = $(COMMONOBJS) $(MSWOBJS) - -default: wx - -wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph makeoutdir $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) - -all: wx - -makeoutdir: - -mkdir $(OBJ_PATH) - -# Copy the in-CVS setup0.h to setup.h if necessary -makesetuph: - cd $(WXDIR)\include\wx\msw - if not exist setup.h copy setup0.h setup.h - cd $(WXDIR)\src\msw - -# Copy include\wx\msw\setup.h to the architecture-specific location -makearchsetuph: - copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH) - cd $(WXDIR)\src\msw - -$(ARCHINCDIR)\wx: - -mkdir $(ARCHINCDIR) - -mkdir $(ARCHINCDIR)\wx - -erase $(CFG) - -!if "$(DLL)" == "0" - -$(LIBTARGET): $(DUMMY).obj $(OBJECTS) - -erase $(WXLIB) - tlib "$(WXLIB)" /P1024 @&&! -+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) -! - -!else - -$(LIBTARGET): $(DUMMY).obj $(OBJECTS) - -erase $(WXLIB) - -erase $(WXDLL) - $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&! -c0d32.obj $(OBJECTS) -$(WXLIBDIR)\$(WXLIBNAME) -nul -$(PERIPH_LIBS) $(LIBS) -wxb32 -! - implib -c $(LIBTARGET) $(WXLIBDIR)\$(WXLIBNAME).dll -!endif - -dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h -dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res - -version.res: - brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc - -$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) - -$(OBJ_PATH)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF) - -$(OBJ_PATH)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF) - -$(OBJ_PATH)\gsocket.obj: $(MSWDIR)\gsocket.c - -$(OBJ_PATH)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c - -$(OBJ_PATH)\main.obj: $(MSWDIR)\main.$(SRCSUFF) - -$(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) - -$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) - -$(OBJ_PATH)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF) - -$(OBJ_PATH)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF) - -$(OBJ_PATH)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF) - -$(OBJ_PATH)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF) - -$(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) - -$(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) - -$(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) - - - -######################################################## -# Common objects (always compiled) - -$(OBJ_PATH)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF) - -$(OBJ_PATH)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF) - -$(OBJ_PATH)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF) - -$(OBJ_PATH)\config.obj: $(COMMDIR)\config.$(SRCSUFF) - -$(OBJ_PATH)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) - -$(OBJ_PATH)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) - -$(OBJ_PATH)\db.obj: $(COMMDIR)\db.$(SRCSUFF) - -$(OBJ_PATH)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF) - -$(OBJ_PATH)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF) - -$(OBJ_PATH)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF) - -$(OBJ_PATH)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF) - -$(OBJ_PATH)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF) - -$(OBJ_PATH)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF) - -$(OBJ_PATH)\event.obj: $(COMMDIR)\event.$(SRCSUFF) - -$(OBJ_PATH)\extended.obj: $(COMMDIR)\extended.c - -$(OBJ_PATH)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF) - -$(OBJ_PATH)\file.obj: $(COMMDIR)\file.$(SRCSUFF) - -$(OBJ_PATH)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF) - -$(OBJ_PATH)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF) - -$(OBJ_PATH)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF) - -$(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF) - -$(OBJ_PATH)\fmapbase.obj: $(COMMDIR)\fmapbase.$(SRCSUFF) - -$(OBJ_PATH)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF) - -$(OBJ_PATH)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF) - -$(OBJ_PATH)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF) - -$(OBJ_PATH)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF) - -$(OBJ_PATH)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF) - -$(OBJ_PATH)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF) - -$(OBJ_PATH)\http.obj: $(COMMDIR)\http.$(SRCSUFF) - -$(OBJ_PATH)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF) - -$(OBJ_PATH)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF) - -$(OBJ_PATH)\list.obj: $(COMMDIR)\list.$(SRCSUFF) - -$(OBJ_PATH)\log.obj: $(COMMDIR)\log.$(SRCSUFF) - -$(OBJ_PATH)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF) - -$(OBJ_PATH)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF) - -$(OBJ_PATH)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF) - -$(OBJ_PATH)\module.obj: $(COMMDIR)\module.$(SRCSUFF) - -$(OBJ_PATH)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF) - -$(OBJ_PATH)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF) - -$(OBJ_PATH)\object.obj: $(COMMDIR)\object.$(SRCSUFF) - -$(OBJ_PATH)\process.obj: $(COMMDIR)\process.$(SRCSUFF) - -$(OBJ_PATH)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF) - -$(OBJ_PATH)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF) - -$(OBJ_PATH)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF) - -$(OBJ_PATH)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF) - -$(OBJ_PATH)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF) - -$(OBJ_PATH)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF) - -$(OBJ_PATH)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) - -$(OBJ_PATH)\stopwatch.obj: $(COMMDIR)\stopwatch.$(SRCSUFF) - -$(OBJ_PATH)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF) - -$(OBJ_PATH)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) - -$(OBJ_PATH)\string.obj: $(COMMDIR)\string.$(SRCSUFF) - -$(OBJ_PATH)\sysopt.obj: $(COMMDIR)\sysopt.$(SRCSUFF) - -$(OBJ_PATH)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF) - -$(OBJ_PATH)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF) - -$(OBJ_PATH)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF) - -$(OBJ_PATH)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF) - -$(OBJ_PATH)\unzip.obj: $(COMMDIR)\unzip.c - -$(OBJ_PATH)\url.obj: $(COMMDIR)\url.$(SRCSUFF) - -$(OBJ_PATH)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF) - -$(OBJ_PATH)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF) - -$(OBJ_PATH)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF) - -$(OBJ_PATH)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF) - -$(OBJ_PATH)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF) - -$(OBJ_PATH)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF) - -$(OBJ_PATH)\init.obj: $(COMMDIR)\init.$(SRCSUFF) - - - - -all_utils: - cd $(WXDIR)\utils - ${MAKE} -f makefile.b32 - cd $(WXDIR)\src\msw - -all_samples: - cd $(WXDIR)\samples - ${MAKE} -f makefile.b32 - cd $(WXDIR)\src\msw - -all_execs: - cd $(WXDIR)\utils - ${MAKE} -f makefile.b32 all_execs - cd $(WXDIR)\src\msw - - - -zlib: $(CFG) - cd $(WXDIR)\src\zlib - ${MAKE} -f makefile.b32 wxUSE_GUI=0 lib - cd $(WXDIR)\src\msw - -clean_zlib: - cd $(WXDIR)\src\zlib - ${MAKE} -f makefile.b32 clean - cd $(WXDIR)\src\msw - - -regex: $(CFG) - cd $(WXDIR)\src\regex - ${MAKE} -f makefile.b32 wxUSE_GUI=0 lib - cd $(WXDIR)\src\msw - -clean_regex: - cd $(WXDIR)\src\regex - ${MAKE} -f makefile.b32 clean - cd $(WXDIR)\src\msw - - - -$(CFG): makebase.b32 - copy &&! --Hc --H=$(WXDIR)\src\msw\wx32.csm --3 --d --a1 # byte alignment --R- --X --w-par --w-aus --w-hid # virtual function A hides virtual function B --tWM --tWC - --I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff;$(THISDIR) --I$(WXDIR)\include\wx\msw\gnuwin32 - --L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk --D__WXWIN__ --D__WXMSW__ --D__WINDOWS__ --DWIN32 -$(OPT) -$(DEBUG_FLAGS) -$(WIN95FLAG) -! $(CFG) - -clean: $(PERIPH_CLEAN_TARGET) - -$(RM) $(WXLIBDIR)\*.tds - -$(RM) $(WXLIBDIR)\*.il? - -$(RM) $(OBJ_PATH)\*.obj - -$(RM) $(OBJ_PATH)\*.pch - -$(RM) $(OBJ_PATH)\*.csm - -$(RM) $(OBJ_PATH)\"wx32.#??" - -cleancfg: - -$(RM) $(OBJ_PATH)\*.cfg - - -cleanall: clean cleancfg - - -self: - cd $(WXWIN)\distrib\msw\tmake - perl -S tmake -tb32base wxwin.pro -o makebase.b32 - copy makebase.b32 $(WXWIN)\src\msw diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc deleted file mode 100644 index 30d299e364..0000000000 --- a/src/msw/makebase.vc +++ /dev/null @@ -1,264 +0,0 @@ -# This file was automatically generated by tmake -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T! - -# File: makebase.vc -# Author: Mark Johnson -# Created: 12 March 2001 -# Updated: -# Copyright: (c) 1997, Julian Smart -# -# "%W% %G%" -# -# Makefile : Builds wxWindows library wxBase(d).lib for VC++ (32-bit) -# Arguments: -# -# FINAL=1 argument to nmake to build version with no debugging info. -# -# wxUSE_GUI=0 argument to build wxWindows version with no GUI (Console) -# - makevc.env changes lib name to wxBase(d).lib -# -wxUSE_GUI = 0 -!include <../makevc.env> - -THISDIR=$(WXWIN)\src\msw - -LIBTARGET=$(WXLIB) - -# This one overrides the others, to be consistent with the settings in setup.h -MINIMAL_WXWINDOWS_SETUP=0 - -PERIPH_LIBS= -PERIPH_TARGET= -PERIPH_CLEAN_TARGET= - -# These are absolute paths, so that the compiler -# generates correct __FILE__ symbols for debugging. -# Otherwise you don't be able to double-click on a memory -# error to load that file. -COMMDIR=$(WXDIR)\src\common -MSWDIR=$(WXDIR)\src\msw - -{../common}.cpp{../common/$D}.obj: - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $< -<< - -{../common}.c{../common/$D}.obj: - cl @<< -$(CPPFLAGS2) /Fo$@ /c /Tc $< -<< - -{../msw}.cpp{../msw/$D}.obj: - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $< -<< - -{../msw}.c{../msw/$D}.obj: - cl @<< -$(CPPFLAGS2) /Fo$@ /c /Tc $< -<< - -COMMONOBJS = \ - ..\common\$D\appcmn.obj \ - ..\common\$D\clntdata.obj \ - ..\common\$D\cmdline.obj \ - ..\common\$D\config.obj \ - ..\common\$D\datetime.obj \ - ..\common\$D\datstrm.obj \ - ..\common\$D\db.obj \ - ..\common\$D\dbtable.obj \ - ..\common\$D\dircmn.obj \ - ..\common\$D\dynarray.obj \ - ..\common\$D\dynlib.obj \ - ..\common\$D\dynload.obj \ - ..\common\$D\encconv.obj \ - ..\common\$D\event.obj \ - ..\common\$D\extended.obj \ - ..\common\$D\ffile.obj \ - ..\common\$D\file.obj \ - ..\common\$D\fileconf.obj \ - ..\common\$D\filefn.obj \ - ..\common\$D\filename.obj \ - ..\common\$D\filesys.obj \ - ..\common\$D\fontmap.obj \ - ..\common\$D\fs_inet.obj \ - ..\common\$D\fs_mem.obj \ - ..\common\$D\fs_zip.obj \ - ..\common\$D\ftp.obj \ - ..\common\$D\hash.obj \ - ..\common\$D\hashmap.obj \ - ..\common\$D\http.obj \ - ..\common\$D\intl.obj \ - ..\common\$D\ipcbase.obj \ - ..\common\$D\list.obj \ - ..\common\$D\log.obj \ - ..\common\$D\longlong.obj \ - ..\common\$D\memory.obj \ - ..\common\$D\mimecmn.obj \ - ..\common\$D\module.obj \ - ..\common\$D\msgout.obj \ - ..\common\$D\mstream.obj \ - ..\common\$D\object.obj \ - ..\common\$D\process.obj \ - ..\common\$D\protocol.obj \ - ..\common\$D\regex.obj \ - ..\common\$D\sckaddr.obj \ - ..\common\$D\sckfile.obj \ - ..\common\$D\sckipc.obj \ - ..\common\$D\sckstrm.obj \ - ..\common\$D\socket.obj \ - ..\common\$D\strconv.obj \ - ..\common\$D\stream.obj \ - ..\common\$D\string.obj \ - ..\common\$D\sysopt.obj \ - ..\common\$D\textbuf.obj \ - ..\common\$D\textfile.obj \ - ..\common\$D\timercmn.obj \ - ..\common\$D\tokenzr.obj \ - ..\common\$D\txtstrm.obj \ - ..\common\$D\unzip.obj \ - ..\common\$D\url.obj \ - ..\common\$D\utilscmn.obj \ - ..\common\$D\variant.obj \ - ..\common\$D\wfstream.obj \ - ..\common\$D\wxchar.obj \ - ..\common\$D\zipstrm.obj \ - ..\common\$D\zstream.obj \ - ..\common\$D\init.obj - -MSWOBJS = ..\msw\$D\dde.obj \ - ..\msw\$D\dir.obj \ - ..\msw\$D\gsocket.obj \ - ..\msw\$D\gsockmsw.obj \ - ..\msw\$D\main.obj \ - ..\msw\$D\mimetype.obj \ - ..\msw\$D\regconf.obj \ - ..\msw\$D\registry.obj \ - ..\msw\$D\snglinst.obj \ - ..\msw\$D\thread.obj \ - ..\msw\$D\utils.obj \ - ..\msw\$D\utilsexc.obj \ - ..\msw\$D\volume.obj - -OBJECTS = $(COMMONOBJS) $(MSWOBJS) - -ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT) -SETUP_H=$(ARCHINCDIR)\wx\setup.h - -# Normal, static library -#all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) -all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET) - -$(WXDIR)\include\wx\msw\setup.h: - cd $(WXDIR)\include\wx\msw - if not exist setup.h copy setup0.h setup.h - cd $(WXDIR)\src\msw - -$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h - copy $(WXDIR)\include\wx\msw\setup.h $@ - -dirs: $(MSWDIR)\$D $(COMMDIR)\$D - -$D: - mkdir $D - -$(COMMDIR)\$D: - mkdir $(COMMDIR)\$D - -$(MSWDIR)\$D: - mkdir $(MSWDIR)\$D - -### Static library - -$(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) - -erase $(LIBTARGET) - $(implib) @<< --out:$@ --machine:$(CPU) -$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS) -<< - -$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) - cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp -######################################################## - -$(OBJECTS): $(WXDIR)/include/wx/setup.h - -..\common\$D\unzip.obj: ..\common\unzip.c - cl @<< -$(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@ -<< - -png: - cd $(WXDIR)\src\png - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) - cd $(WXDIR)\src\msw - -clean_png: - cd $(WXDIR)\src\png - nmake -f makefile.vc clean - cd $(WXDIR)\src\msw - -zlib: - cd $(WXDIR)\src\zlib - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) - cd $(WXDIR)\src\msw - -clean_zlib: - cd $(WXDIR)\src\zlib - nmake -f makefile.vc clean - cd $(WXDIR)\src\msw - -jpeg: - cd $(WXDIR)\src\jpeg - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all - cd $(WXDIR)\src\msw - -clean_jpeg: - cd $(WXDIR)\src\jpeg - nmake -f makefile.vc clean - cd $(WXDIR)\src\msw - -tiff: - cd $(WXDIR)\src\tiff - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all - cd $(WXDIR)\src\msw - -clean_tiff: - cd $(WXDIR)\src\tiff - nmake -f makefile.vc clean - cd $(WXDIR)\src\msw - -xpm: - cd $(WXDIR)\src\xpm - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) - cd $(WXDIR)\src\msw - -clean_xpm: - cd $(WXDIR)\src\xpm - nmake -f makefile.vc clean - cd $(WXDIR)\src\msw - -cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk - - -clean: $(PERIPH_CLEAN_TARGET) - -erase $(LIBTARGET) - -erase $(COMMDIR)\$D\*.obj - -erase $(COMMDIR)\$D\*.pdb - -erase $(COMMDIR)\$D\*.sbr - -erase $(COMMDIR)\$D\*.idb - -erase $(COMMDIR)\$D\*.pch - -erase $(MSWDIR)\$D\*.idb - -erase $(MSWDIR)\$D\*.pdb - -erase $(MSWDIR)\$D\*.pch - -erase $(MSWDIR)\$D\*.obj - -erase $(MSWDIR)\$D\*.sbr - -erase $(MSWDIR)\$D\*.pdb - -rmdir $(D) - -rmdir ..\common\$(D) - diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic deleted file mode 100644 index b544a55a3f..0000000000 --- a/src/msw/makefile.mic +++ /dev/null @@ -1,356 +0,0 @@ -############################################################################## -# Microwindows template Makefile -# Copyright (c) 2000 Martin Jolicoeur, Greg Haerr -# Licence: wxWindows Licence -############################################################################## - -TOP=$(MICROWINDOWS) -ifeq "$(MICROWINDOWS)" "" -TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src -endif - -CONFIG = $(TOP)/config -WXDIR = ../.. -OBJSUFF = o -SRCSUFF = cpp -WXLIB=$(WXDIR)/lib/libwx.a -AROPTIONS = ruv -RANLIB = ranlib -RM = rm -f - -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -ZLIBDIR = $(WXDIR)/src/zlib -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -TIFFDIR = $(WXDIR)/src/tiff -OLEDIR = $(WXDIR)/src/msw/ole -MICROWINDIR = $(WXDIR)/src/msw -UNIXDIR = $(WXDIR)/src/unix -UNIVDIR = $(WXDIR)/src/univ - -ZLIBLIB = $(WXDIR)/lib/libzlib.a -PNGLIB = $(WXDIR)/lib/libpng.a -JPEGLIB = $(WXDIR)/lib/libjpeg.a -TIFFLIB = $(WXDIR)/lib/libtiff.a - -GENERICOBJS = \ - $(GENDIR)/accel.$(OBJSUFF) \ - $(GENDIR)/busyinfo.$(OBJSUFF) \ - $(GENDIR)/calctrl.$(OBJSUFF) \ - $(GENDIR)/choicdgg.$(OBJSUFF) \ - $(GENDIR)/colrdlgg.$(OBJSUFF) \ - $(GENDIR)/dirctrlg.$(OBJSUFF) \ - $(GENDIR)/dragimgg.$(OBJSUFF) \ - $(GENDIR)/fontdlgg.$(OBJSUFF) \ - $(GENDIR)/grid.$(OBJSUFF) \ - $(GENDIR)/gridctrl.$(OBJSUFF) \ - $(GENDIR)/gridsel.$(OBJSUFF) \ - $(GENDIR)/imaglist.$(OBJSUFF) \ - $(GENDIR)/laywin.$(OBJSUFF) \ - $(GENDIR)/listctrl.$(OBJSUFF) \ - $(GENDIR)/logg.$(OBJSUFF) \ - $(GENDIR)/msgdlgg.$(OBJSUFF) \ - $(GENDIR)/numdlgg.$(OBJSUFF) \ - $(GENDIR)/panelg.$(OBJSUFF) \ - $(GENDIR)/progdlgg.$(OBJSUFF) \ - $(GENDIR)/sashwin.$(OBJSUFF) \ - $(GENDIR)/scrlwing.$(OBJSUFF) \ - $(GENDIR)/spinctlg.$(OBJSUFF) \ - $(GENDIR)/splash.$(OBJSUFF) \ - $(GENDIR)/splitter.$(OBJSUFF) \ - $(GENDIR)/tabg.$(OBJSUFF) \ - $(GENDIR)/tbarsmpl.$(OBJSUFF) \ - $(GENDIR)/textdlgg.$(OBJSUFF) \ - $(GENDIR)/tipdlg.$(OBJSUFF) \ - $(GENDIR)/tipwin.$(OBJSUFF) \ - $(GENDIR)/treectlg.$(OBJSUFF) \ - $(GENDIR)/treelay.$(OBJSUFF) \ - $(GENDIR)/wizard.$(OBJSUFF) - -COMMONOBJS = \ - $(COMMDIR)/appcmn.$(OBJSUFF) \ - $(COMMDIR)/choiccmn.$(OBJSUFF) \ - $(COMMDIR)/clntdata.$(OBJSUFF) \ - $(COMMDIR)/clipcmn.$(OBJSUFF) \ - $(COMMDIR)/cmdline.$(OBJSUFF) \ - $(COMMDIR)/cmdproc.$(OBJSUFF) \ - $(COMMDIR)/cmndata.$(OBJSUFF) \ - $(COMMDIR)/config.$(OBJSUFF) \ - $(COMMDIR)/containr.$(OBJSUFF) \ - $(COMMDIR)/cshelp.$(OBJSUFF) \ - $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ - $(COMMDIR)/ctrlsub.$(OBJSUFF) \ - $(COMMDIR)/datetime.$(OBJSUFF) \ - $(COMMDIR)/datstrm.$(OBJSUFF) \ - $(COMMDIR)/dcbase.$(OBJSUFF) \ - $(COMMDIR)/dircmn.$(OBJSUFF) \ - $(COMMDIR)/dlgcmn.$(OBJSUFF) \ - $(COMMDIR)/dobjcmn.$(OBJSUFF) \ - $(COMMDIR)/docview.$(OBJSUFF) \ - $(COMMDIR)/dynarray.$(OBJSUFF) \ - $(COMMDIR)/dynlib.$(OBJSUFF) \ - $(COMMDIR)/effects.$(OBJSUFF) \ - $(COMMDIR)/encconv.$(OBJSUFF) \ - $(COMMDIR)/event.$(OBJSUFF) \ - $(COMMDIR)/extended.$(OBJSUFF) \ - $(COMMDIR)/ffile.$(OBJSUFF) \ - $(COMMDIR)/file.$(OBJSUFF) \ - $(COMMDIR)/fileconf.$(OBJSUFF) \ - $(COMMDIR)/filefn.$(OBJSUFF) \ - $(COMMDIR)/filename.$(OBJSUFF) \ - $(COMMDIR)/filesys.$(OBJSUFF) \ - $(COMMDIR)/fontcmn.$(OBJSUFF) \ - $(COMMDIR)/fontmap.$(OBJSUFF) \ - $(COMMDIR)/framecmn.$(OBJSUFF) \ - $(COMMDIR)/gaugecmn.$(OBJSUFF) \ - $(COMMDIR)/gdicmn.$(OBJSUFF) \ - $(COMMDIR)/geometry.$(OBJSUFF) \ - $(COMMDIR)/gifdecod.$(OBJSUFF) \ - $(COMMDIR)/hash.$(OBJSUFF) \ - $(COMMDIR)/helpbase.$(OBJSUFF) \ - $(COMMDIR)/imagall.$(OBJSUFF) \ - $(COMMDIR)/imagbmp.$(OBJSUFF) \ - $(COMMDIR)/image.$(OBJSUFF) \ - $(COMMDIR)/imaggif.$(OBJSUFF) \ - $(COMMDIR)/imagjpeg.$(OBJSUFF) \ - $(COMMDIR)/imagpcx.$(OBJSUFF) \ - $(COMMDIR)/imagpng.$(OBJSUFF) \ - $(COMMDIR)/imagpnm.$(OBJSUFF) \ - $(COMMDIR)/imagtiff.$(OBJSUFF) \ - $(COMMDIR)/imagxpm.$(OBJSUFF) \ - $(COMMDIR)/intl.$(OBJSUFF) \ - $(COMMDIR)/ipcbase.$(OBJSUFF) \ - $(COMMDIR)/layout.$(OBJSUFF) \ - $(COMMDIR)/lboxcmn.$(OBJSUFF) \ - $(COMMDIR)/list.$(OBJSUFF) \ - $(COMMDIR)/log.$(OBJSUFF) \ - $(COMMDIR)/longlong.$(OBJSUFF) \ - $(COMMDIR)/matrix.$(OBJSUFF) \ - $(COMMDIR)/memory.$(OBJSUFF) \ - $(COMMDIR)/menucmn.$(OBJSUFF) \ - $(COMMDIR)/mimecmn.$(OBJSUFF) \ - $(COMMDIR)/module.$(OBJSUFF) \ - $(COMMDIR)/mstream.$(OBJSUFF) \ - $(COMMDIR)/nbkbase.$(OBJSUFF) \ - $(COMMDIR)/object.$(OBJSUFF) \ - $(COMMDIR)/paper.$(OBJSUFF) \ - $(COMMDIR)/popupcmn.$(OBJSUFF) \ - $(COMMDIR)/prntbase.$(OBJSUFF) \ - $(COMMDIR)/process.$(OBJSUFF) \ - $(COMMDIR)/quantize.$(OBJSUFF) \ - $(COMMDIR)/radiocmn.$(OBJSUFF) \ - $(COMMDIR)/sizer.$(OBJSUFF) \ - $(COMMDIR)/statbar.$(OBJSUFF) \ - $(COMMDIR)/strconv.$(OBJSUFF) \ - $(COMMDIR)/stream.$(OBJSUFF) \ - $(COMMDIR)/string.$(OBJSUFF) \ - $(COMMDIR)/sysopt.$(OBJSUFF) \ - $(COMMDIR)/tbarbase.$(OBJSUFF) \ - $(COMMDIR)/textbuf.$(OBJSUFF) \ - $(COMMDIR)/textcmn.$(OBJSUFF) \ - $(COMMDIR)/textfile.$(OBJSUFF) \ - $(COMMDIR)/timercmn.$(OBJSUFF) \ - $(COMMDIR)/tokenzr.$(OBJSUFF) \ - $(COMMDIR)/toplvcmn.$(OBJSUFF) \ - $(COMMDIR)/treebase.$(OBJSUFF) \ - $(COMMDIR)/txtstrm.$(OBJSUFF) \ - $(COMMDIR)/utilscmn.$(OBJSUFF) \ - $(UNIXDIR)/utilsunx.$(OBJSUFF) \ - $(COMMDIR)/valgen.$(OBJSUFF) \ - $(COMMDIR)/validate.$(OBJSUFF) \ - $(COMMDIR)/valtext.$(OBJSUFF) \ - $(COMMDIR)/variant.$(OBJSUFF) \ - $(COMMDIR)/wfstream.$(OBJSUFF) \ - $(COMMDIR)/wincmn.$(OBJSUFF) \ - $(COMMDIR)/wxchar.$(OBJSUFF) \ - $(COMMDIR)/xpmdecod.$(OBJSUFF) - -HTMLOBJS = \ - $(HTMLDIR)/helpctrl.$(OBJSUFF) \ - $(HTMLDIR)/helpdata.$(OBJSUFF) \ - $(HTMLDIR)/helpfrm.$(OBJSUFF) \ - $(HTMLDIR)/htmlcell.$(OBJSUFF) \ - $(HTMLDIR)/htmlfilt.$(OBJSUFF) \ - $(HTMLDIR)/htmlpars.$(OBJSUFF) \ - $(HTMLDIR)/htmltag.$(OBJSUFF) \ - $(HTMLDIR)/htmlwin.$(OBJSUFF) \ - $(HTMLDIR)/htmprint.$(OBJSUFF) \ - $(HTMLDIR)/m_dflist.$(OBJSUFF) \ - $(HTMLDIR)/m_fonts.$(OBJSUFF) \ - $(HTMLDIR)/m_hline.$(OBJSUFF) \ - $(HTMLDIR)/m_image.$(OBJSUFF) \ - $(HTMLDIR)/m_layout.$(OBJSUFF) \ - $(HTMLDIR)/m_links.$(OBJSUFF) \ - $(HTMLDIR)/m_list.$(OBJSUFF) \ - $(HTMLDIR)/m_meta.$(OBJSUFF) \ - $(HTMLDIR)/m_pre.$(OBJSUFF) \ - $(HTMLDIR)/m_tables.$(OBJSUFF) \ - $(HTMLDIR)/winpars.$(OBJSUFF) - -MSWOBJS = \ - $(MICROWINDIR)/app.$(OBJSUFF) \ - $(MICROWINDIR)/bitmap.$(OBJSUFF) \ - $(MICROWINDIR)/brush.$(OBJSUFF) \ - $(MICROWINDIR)/caret.$(OBJSUFF) \ - $(MICROWINDIR)/clipbrd.$(OBJSUFF) \ - $(MICROWINDIR)/colour.$(OBJSUFF) \ - $(MICROWINDIR)/cursor.$(OBJSUFF) \ - $(MICROWINDIR)/data.$(OBJSUFF) \ - $(MICROWINDIR)/dc.$(OBJSUFF) \ - $(MICROWINDIR)/dcclient.$(OBJSUFF) \ - $(MICROWINDIR)/dcmemory.$(OBJSUFF) \ - $(MICROWINDIR)/dcprint.$(OBJSUFF) \ - $(MICROWINDIR)/dcscreen.$(OBJSUFF) \ - $(MICROWINDIR)/dde.$(OBJSUFF) \ - $(MICROWINDIR)/dialog.$(OBJSUFF) \ - $(MICROWINDIR)/dialup.$(OBJSUFF) \ - $(UNIXDIR)/dir.$(OBJSUFF) \ - $(MICROWINDIR)/evtloop.$(OBJSUFF) \ - $(MICROWINDIR)/font.$(OBJSUFF) \ - $(MICROWINDIR)/fontenum.$(OBJSUFF) \ - $(MICROWINDIR)/fontutil.$(OBJSUFF) \ - $(MICROWINDIR)/gdiimage.$(OBJSUFF) \ - $(MICROWINDIR)/gdiobj.$(OBJSUFF) \ - $(MICROWINDIR)/icon.$(OBJSUFF) \ - $(MICROWINDIR)/main.$(OBJSUFF) \ - $(MICROWINDIR)/microwin.$(OBJSUFF) \ - $(MICROWINDIR)/palette.$(OBJSUFF) \ - $(MICROWINDIR)/pen.$(OBJSUFF) \ - $(MICROWINDIR)/region.$(OBJSUFF) \ - $(MICROWINDIR)/settings.$(OBJSUFF) \ - $(MICROWINDIR)/snglinst.$(OBJSUFF) \ - $(MICROWINDIR)/thread.$(OBJSUFF) \ - $(MICROWINDIR)/timer.$(OBJSUFF) \ - $(MICROWINDIR)/toplevel.$(OBJSUFF) \ - $(MICROWINDIR)/utils.$(OBJSUFF) \ - $(MICROWINDIR)/window.$(OBJSUFF) \ - $(OLEDIR)/dataobj.$(OBJSUFF) - -UNIVOBJS_TODO = $(UNIVDIR)/choice.$(OBJSUFF) \ - $(UNIVDIR)/colordlg.$(OBJSUFF) \ - - -UNIVOBJS = \ - $(UNIVDIR)/bmpbuttn.$(OBJSUFF) \ - $(UNIVDIR)/button.$(OBJSUFF) \ - $(UNIVDIR)/checkbox.$(OBJSUFF) \ - $(UNIVDIR)/checklst.$(OBJSUFF) \ - $(UNIVDIR)/colschem.$(OBJSUFF) \ - $(UNIVDIR)/combobox.$(OBJSUFF) \ - $(UNIVDIR)/control.$(OBJSUFF) \ - $(UNIVDIR)/framuniv.$(OBJSUFF) \ - $(UNIVDIR)/gauge.$(OBJSUFF) \ - $(UNIVDIR)/inphand.$(OBJSUFF) \ - $(UNIVDIR)/inpcons.$(OBJSUFF) \ - $(UNIVDIR)/listbox.$(OBJSUFF) \ - $(UNIVDIR)/menu.$(OBJSUFF) \ - $(UNIVDIR)/notebook.$(OBJSUFF) \ - $(UNIVDIR)/radiobox.$(OBJSUFF) \ - $(UNIVDIR)/radiobut.$(OBJSUFF) \ - $(UNIVDIR)/renderer.$(OBJSUFF) \ - $(UNIVDIR)/scrarrow.$(OBJSUFF) \ - $(UNIVDIR)/scrolbar.$(OBJSUFF) \ - $(UNIVDIR)/scrthumb.$(OBJSUFF) \ - $(UNIVDIR)/slider.$(OBJSUFF) \ - $(UNIVDIR)/spinbutt.$(OBJSUFF) \ - $(UNIVDIR)/statbmp.$(OBJSUFF) \ - $(UNIVDIR)/statbox.$(OBJSUFF) \ - $(UNIVDIR)/statline.$(OBJSUFF) \ - $(UNIVDIR)/stattext.$(OBJSUFF) \ - $(UNIVDIR)/statusbr.$(OBJSUFF) \ - $(UNIVDIR)/textctrl.$(OBJSUFF) \ - $(UNIVDIR)/theme.$(OBJSUFF) \ - $(UNIVDIR)/topluniv.$(OBJSUFF) \ - $(UNIVDIR)/winuniv.$(OBJSUFF) \ - $(UNIVDIR)/themes/gtk.$(OBJSUFF) \ - $(UNIVDIR)/themes/win32.$(OBJSUFF) - -include $(CONFIG) - -######################## Additional Flags section ############################ - -# Directories list for header files -INCLUDEDIRS += -I$(WXDIR)/include -# Defines for preprocessor -DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\"" - -# Compilation flags for C files OTHER than include directories -CFLAGS += -# Preprocessor flags OTHER than defines -CPPFLAGS += -# Linking flags -LDFLAGS += - -############################# targets section ################################ - -# If you want to create a library with the objects files, define the name here -LIBNAME = - -# If we put it below OBJS=, Makefile.rules includes .depend -# and it continually looks for .c files to satisfy .o.cpp -# dependency. What's going on there? -include $(TOP)/Makefile.rules - -# List of objects to compile -OBJS = $(COMMONOBJS) $(MSWOBJS) $(GENERICOBJS) $(UNIVOBJS) - -all: $(WXLIB) - -######################### Makefile.rules section ############################# - - - -######################## Tools targets section ############################### - -#ntest: $(OBJS) $(NANOXCLIENTLIBS) $(TOP)/config -# $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(NANOXCLIENTLIBS) - -$(WXLIB): $(OBJS) - ar $(AROPTIONS) $@ $(OBJS) - $(RANLIB) $@ - -#.SUFFIXES: .cpp .cxx .c - -#.c.o: -# $(CC) -c $(CFLAGS) $(CFLAGS) -o $@ $*.c - -.cxx.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $*.cxx - -.cpp.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $*.cpp - -#$(COMMDIR)/appcmn.o: $(COMMDIR)/appcmn.cpp -# $(CC) -c $(CPPFLAGS) -o $@ $*.cpp - -#appcmn.o: $(COMMDIR)/appcmn.cpp -# $(CC) $(CPPFLAGS) -c -o $@ $< - -cleanwx: - -$(RM) *.o - -$(RM) *.bak - -$(RM) core - -$(RM) ole/*.o - -$(RM) ../common/y_tab.c - -$(RM) ../common/lex_yy.c - -$(RM) ../common/*.o - -$(RM) ../common/*.bak - -$(RM) ../generic/*.o - -$(RM) ../generic/*.bak - -$(RM) ../univ/*.o - -$(RM) ../univ/*.bak - -$(RM) ../univ/themes/*.o - -$(RM) ../univ/themes/*.bak - -$(RM) ../unix/*.o - -$(RM) ../unix/*.bak - -$(RM) ../html/*.o - -$(RM) ../zlib/*.o - -$(RM) ../zlib/*.bak - -$(RM) ../png/*.o - -$(RM) ../png/*.bak - -$(RM) ../jpeg/*.o - -$(RM) ../jpeg/*.bak - -$(RM) ../tiff/*.o - -$(RM) ../tiff/*.bak diff --git a/src/msw/makefile.sl b/src/msw/makefile.sl deleted file mode 100644 index 296f76b193..0000000000 --- a/src/msw/makefile.sl +++ /dev/null @@ -1,914 +0,0 @@ -# -# File: makefile.wat -# Author: Julian Smart -# Created: 1998 -# -# Makefile : Builds wxWindows library for Salford C++, WIN32 - -include ..\makesl.env - -LIBTARGET = $(WXLIB)\wx.lib -EXTRATARGETS = # xpm png zlib -EXTRATARGETSCLEAN = # clean_xpm clean_png clean_zlib -GENDIR=$(WXDIR)\src\generic -COMMDIR=$(WXDIR)\src\common -XPMDIR=$(WXDIR)\src\xpm -OLEDIR=ole -MSWDIR=$(WXDIR)\src\msw - -GENERICOBJS= choicdgg.obj \ - dirdlgg.obj \ - gridg.obj \ - laywin.obj \ - panelg.obj \ - prop.obj \ - progdlgg.obj \ - propform.obj \ - proplist.obj \ - sashwin.obj \ - scrolwin.obj \ - splitter.obj \ - statusbr.obj \ - tabg.obj \ - textdlgg.obj - -# These are generic things that don't need to be compiled on MSW, -# but sometimes it's useful to do so for testing purposes. -NONESSENTIALOBJS= printps.obj \ - prntdlgg.obj \ - msgdlgg.obj \ - colrdlgg.obj \ - fontdlgg.obj - -COMMONOBJS = cmndata.obj \ - config.obj \ - dcbase.obj \ - docview.obj \ - docmdi.obj \ - dynarray.obj \ - dynlib.obj \ - event.obj \ - file.obj \ - filefn.obj \ - fileconf.obj \ - framecmn.obj \ - gdicmn.obj \ - image.obj \ - intl.obj \ - ipcbase.obj \ - helpbase.obj \ - layout.obj \ - log.obj \ - memory.obj \ - module.obj \ - object.obj \ - prntbase.obj \ - resource.obj \ - tbarbase.obj \ - tbarsmpl.obj \ - textfile.obj \ - timercmn.obj \ - utilscmn.obj \ - validate.obj \ - valgen.obj \ - valtext.obj \ - date.obj \ - hash.obj \ - list.obj \ - paper.obj \ - string.obj \ - socket.obj \ - sckint.obj \ - sckaddr.obj \ - sckfile.obj \ - sckipc.obj \ - sckstrm.obj \ - url.obj \ - http.obj \ - protocol.obj \ - time.obj \ - tokenzr.obj \ - wxexpr.obj \ - y_tab.obj \ - extended.obj \ - process.obj \ - wfstream.obj \ - mstream.obj \ - zstream.obj \ - stream.obj \ - datstrm.obj \ - objstrm.obj \ - variant.obj \ - wincmn.obj \ - wxchar.obj - -# Can't compile these yet under Salford C++ -# mimetype.obj \ -# db.obj \ -# dbtable.obj \ - -MSWOBJS = \ - accel.obj \ - app.obj \ - bitmap.obj \ - bmpbuttn.obj \ - brush.obj \ - button.obj \ - checkbox.obj \ - checklst.obj \ - caret.obj \ - choice.obj \ - clipbrd.obj \ - colordlg.obj \ - colour.obj \ - combobox.obj \ - control.obj \ - curico.obj \ - cursor.obj \ - data.obj \ - dc.obj \ - dcmemory.obj \ - dcclient.obj \ - dcprint.obj \ - dcscreen.obj \ - dde.obj \ - dialog.obj \ - dib.obj \ - dibutils.obj \ - filedlg.obj \ - font.obj \ - fontdlg.obj \ - frame.obj \ - gauge95.obj \ - gdiobj.obj \ - helpwin.obj \ - icon.obj \ - imaglist.obj \ - iniconf.obj \ - joystick.obj \ - listbox.obj \ - listctrl.obj \ - main.obj \ - mdi.obj \ - menu.obj \ - menuitem.obj \ - metafile.obj \ - minifram.obj \ - msgdlg.obj \ - nativdlg.obj \ - notebook.obj \ - ownerdrw.obj \ - palette.obj \ - pen.obj \ - penwin.obj \ - printdlg.obj \ - printwin.obj \ - radiobox.obj \ - radiobut.obj \ - region.obj \ - registry.obj \ - regconf.obj \ - scrolbar.obj \ - settings.obj \ - slidrmsw.obj \ - slider95.obj \ - spinbutt.obj \ - statbmp.obj \ - statbox.obj \ - statbr95.obj \ - stattext.obj \ - tabctrl.obj \ - taskbar.obj \ - tbar95.obj \ - tbarmsw.obj \ - textctrl.obj \ - thread.obj \ - timer.obj \ - tooltip.obj \ - treectrl.obj \ - utils.obj \ - utilsexc.obj \ - wave.obj \ - window.obj - -# No OLE functions for wxDirDialog: use generic one instead -# dirdlg.obj \ -# pnghand.obj \ -# xpmhand.obj \ - -OLEOBJS = \ - droptgt.obj \ - dropsrc.obj \ - dataobj.obj \ - oleutils.obj \ - uuid.obj \ - automtn.obj - -# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(OLEOBJS) - -all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) - -$(LIBTARGET) : $(OBJECTS) - slink $$salford.lnk - -clean: $(EXTRATARGETSCLEAN) - -erase *.obj - -erase $(LIBTARGET) - -erase *.pch - -erase *.err - -cleanall: clean - -test: test.obj - -test.obj: test.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) test.cpp - -accel.obj: $(MSWDIR)\accel.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\accel.cpp /BINARY accel.obj - -app.obj: $(MSWDIR)\app.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\app.cpp /BINARY app.obj - -bitmap.obj: $(MSWDIR)\bitmap.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\bitmap.cpp /BINARY bitmap.obj - -bmpbuttn.obj: $(MSWDIR)\bmpbuttn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\bmpbuttn.cpp /BINARY bmpbuttn.obj - -brush.obj: $(MSWDIR)\brush.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\brush.cpp /BINARY brush.obj - -button.obj: $(MSWDIR)\button.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\button.cpp /BINARY button.obj - -caret.obj: $(MSWDIR)\caret.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\caret.cpp /BINARY caret.obj - -choice.obj: $(MSWDIR)\choice.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\choice.cpp /BINARY choice.obj - -checkbox.obj: $(MSWDIR)\checkbox.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\checkbox.cpp /BINARY checkbox.obj - -checklst.obj: $(MSWDIR)\checklst.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\checklst.cpp /BINARY checklst.obj - -clipbrd.obj: $(MSWDIR)\clipbrd.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\clipbrd.cpp /BINARY clipbrd.obj - -colordlg.obj: $(MSWDIR)\colordlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\colordlg.cpp /BINARY colordlg.obj - -colour.obj: $(MSWDIR)\colour.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\colour.cpp /BINARY colour.obj - -combobox.obj: $(MSWDIR)\combobox.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\combobox.cpp /BINARY combobox.obj - -control.obj: $(MSWDIR)\control.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\control.cpp /BINARY control.obj - -curico.obj: $(MSWDIR)\curico.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\curico.cpp /BINARY curico.obj - -cursor.obj: $(MSWDIR)\cursor.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\cursor.cpp /BINARY cursor.obj - -data.obj: $(MSWDIR)\data.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\data.cpp /BINARY data.obj - -dde.obj: $(MSWDIR)\dde.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dde.cpp /BINARY dde.obj - -dc.obj: $(MSWDIR)\dc.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dc.cpp /BINARY dc.obj - -dcmemory.obj: $(MSWDIR)\dcmemory.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcmemory.cpp /BINARY dcmemory.obj - -dcclient.obj: $(MSWDIR)\dcclient.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcclient.cpp /BINARY dcclient.obj - -dcprint.obj: $(MSWDIR)\dcprint.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcprint.cpp /BINARY dcprint.obj - -dcscreen.obj: $(MSWDIR)\dcscreen.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcscreen.cpp /BINARY dcscreen.obj - -dialog.obj: $(MSWDIR)\dialog.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dialog.cpp /BINARY dialog.obj - -dib.obj: $(MSWDIR)\dib.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dib.cpp /BINARY dib.obj - -dibutils.obj: $(MSWDIR)\dibutils.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dibutils.cpp /BINARY dibutils.obj - -dirdlg.obj: $(MSWDIR)\dirdlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dirdlg.cpp /BINARY dirdlg.obj - -filedlg.obj: $(MSWDIR)\filedlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\filedlg.cpp /BINARY filedlg.obj - -font.obj: $(MSWDIR)\font.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\font.cpp /BINARY font.obj - -fontdlg.obj: $(MSWDIR)\fontdlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\fontdlg.cpp /BINARY fontdlg.obj - -frame.obj: $(MSWDIR)\frame.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\frame.cpp /BINARY frame.obj - -gauge95.obj: $(MSWDIR)\gauge95.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gauge95.cpp /BINARY gauge95.obj - -gdiobj.obj: $(MSWDIR)\gdiobj.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gdiobj.cpp /BINARY gdiobj.obj - -helpwin.obj: $(MSWDIR)\helpwin.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\helpwin.cpp /BINARY helpwin.obj - -icon.obj: $(MSWDIR)\icon.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\icon.cpp /BINARY icon.obj - -imaglist.obj: $(MSWDIR)\imaglist.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\imaglist.cpp /BINARY imaglist.obj - -iniconf.obj: $(MSWDIR)\iniconf.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\iniconf.cpp /BINARY iniconf.obj - -joystick.obj: $(MSWDIR)\joystick.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\joystick.cpp /BINARY joystick.obj - -listbox.obj: $(MSWDIR)\listbox.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\listbox.cpp /BINARY listbox.obj - -listctrl.obj: $(MSWDIR)\listctrl.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\listctrl.cpp /BINARY listctrl.obj - -main.obj: $(MSWDIR)\main.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\main.cpp /BINARY main.obj - -mdi.obj: $(MSWDIR)\mdi.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\mdi.cpp /BINARY mdi.obj - -menu.obj: $(MSWDIR)\menu.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\menu.cpp /BINARY menu.obj - -menuitem.obj: $(MSWDIR)\menuitem.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\menuitem.cpp /BINARY menuitem.obj - -metafile.obj: $(MSWDIR)\metafile.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\metafile.cpp /BINARY metafile.obj - -minifram.obj: $(MSWDIR)\minifram.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\minifram.cpp /BINARY minifram.obj - -msgdlg.obj: $(MSWDIR)\msgdlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\msgdlg.cpp /BINARY msgdlg.obj - -nativdlg.obj: $(MSWDIR)\nativdlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\nativdlg.cpp /BINARY nativdlg.obj - -notebook.obj: $(MSWDIR)\notebook.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\notebook.cpp /BINARY notebook.obj - -ownerdrw.obj: $(MSWDIR)\ownerdrw.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\ownerdrw.cpp /BINARY ownerdrw.obj - -palette.obj: $(MSWDIR)\palette.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\palette.cpp /BINARY palette.obj - -pen.obj: $(MSWDIR)\pen.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\pen.cpp /BINARY pen.obj - -penwin.obj: $(MSWDIR)\penwin.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\penwin.cpp /BINARY penwin.obj - -printdlg.obj: $(MSWDIR)\printdlg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\printdlg.cpp /BINARY printdlg.obj - -printwin.obj: $(MSWDIR)\printwin.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\printwin.cpp /BINARY printwin.obj - -radiobox.obj: $(MSWDIR)\radiobox.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\radiobox.cpp /BINARY radiobox.obj - -radiobut.obj: $(MSWDIR)\radiobut.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\radiobut.cpp /BINARY radiobut.obj - -region.obj: $(MSWDIR)\region.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\region.cpp /BINARY region.obj - -registry.obj: $(MSWDIR)\registry.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\registry.cpp /BINARY registry.obj - -regconf.obj: $(MSWDIR)\regconf.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\regconf.cpp /BINARY regconf.obj - -scrolbar.obj: $(MSWDIR)\scrolbar.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\scrolbar.cpp /BINARY scrolbar.obj - -settings.obj: $(MSWDIR)\settings.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\settings.cpp /BINARY settings.obj - -slidrmsw.obj: $(MSWDIR)\slidrmsw.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\slidrmsw.cpp /BINARY slidrmsw.obj - -slider95.obj: $(MSWDIR)\slider95.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\slider95.cpp /BINARY slider95.obj - -spinbutt.obj: $(MSWDIR)\spinbutt.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\spinbutt.cpp /BINARY spinbutt.obj - -statbmp.obj: $(MSWDIR)\statbmp.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\statbmp.cpp /BINARY statbmp.obj - -statbox.obj: $(MSWDIR)\statbox.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\statbox.cpp /BINARY statbox.obj - -statbr95.obj: $(MSWDIR)\statbr95.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\statbr95.cpp /BINARY statbr95.obj - -stattext.obj: $(MSWDIR)\stattext.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\stattext.cpp /BINARY stattext.obj - -tabctrl.obj: $(MSWDIR)\tabctrl.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tabctrl.cpp /BINARY tabctrl.obj - -taskbar.obj: $(MSWDIR)\taskbar.cpp - cl @<< - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\taskbar.cpp /BINARY taskbar.obj - -tbar95.obj: $(MSWDIR)\tbar95.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tbar95.cpp /BINARY tbar95.obj - -tbarmsw.obj: $(MSWDIR)\tbarmsw.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tbarmsw.cpp /BINARY tbarmsw.obj - -textctrl.obj: $(MSWDIR)\textctrl.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\textctrl.cpp /BINARY textctrl.obj - -thread.obj: $(MSWDIR)\thread.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\thread.cpp /BINARY thread.obj - -timer.obj: $(MSWDIR)\timer.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\timer.cpp /BINARY timer.obj - -tooltip.obj: $(MSWDIR)\tooltip.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tooltip.cpp /BINARY tooltip.obj - -treectrl.obj: $(MSWDIR)\treectrl.cpp - cl @<< - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\treectrl.cpp /BINARY treectrl.obj - -utils.obj: $(MSWDIR)\utils.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\utils.cpp /BINARY utils.obj - -utilsexc.obj: $(MSWDIR)\utilsexc.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\utilsexc.cpp /BINARY utilsexc.obj - -wave.obj: $(MSWDIR)\wave.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\wave.cpp /BINARY wave.obj - -window.obj: $(MSWDIR)\window.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\window.cpp /BINARY window.obj - -xpmhand.obj: $(MSWDIR)\xpmhand.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\xpmhand.cpp /BINARY xpmhand.obj - -droptgt.obj: $(OLEDIR)\droptgt.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\droptgt.cpp /BINARY droptgt.obj - -dropsrc.obj: $(OLEDIR)\dropsrc.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\dropsrc.cpp /BINARY dropsrc.obj - -dataobj.obj: $(OLEDIR)\dataobj.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\dataobj.cpp /BINARY dataobj.obj - -oleutils.obj: $(OLEDIR)\oleutils.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\oleutils.cpp /BINARY oleutils.obj - -uuid.obj: $(OLEDIR)\uuid.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\uuid.cpp /BINARY uuid.obj - -automtn.obj: $(OLEDIR)\automtn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\automtn.cpp /BINARY automtn.obj - -######################################################## -# Common objects (always compiled) - -cmndata.obj: $(COMMDIR)\cmndata.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\cmndata.cpp /BINARY cmndata.obj - -config.obj: $(COMMDIR)\config.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\config.cpp /BINARY config.obj - -dcbase.obj: $(COMMDIR)\dcbase.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dcbase.cpp /BINARY dcbase.obj - -db.obj: $(COMMDIR)\db.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\db.cpp /BINARY db.obj - -dbtable.obj: $(COMMDIR)\dbtable.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dbtable.cpp /BINARY dbtable.obj - -docview.obj: $(COMMDIR)\docview.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\docview.cpp /BINARY docview.obj - -docmdi.obj: $(COMMDIR)\docmdi.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\docmdi.cpp /BINARY docmdi.obj - -dynarray.obj: $(COMMDIR)\dynarray.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dynarray.cpp /BINARY dynarray.obj - -dynlib.obj: $(COMMDIR)\dynlib.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dynlib.cpp /BINARY dynlib.obj - -event.obj: $(COMMDIR)\event.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\event.cpp /BINARY event.obj - -file.obj: $(COMMDIR)\file.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\file.cpp /BINARY file.obj - -fileconf.obj: $(COMMDIR)\fileconf.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\fileconf.cpp /BINARY fileconf.obj - -filefn.obj: $(COMMDIR)\filefn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\filefn.cpp /BINARY filefn.obj - -framecmn.obj: $(COMMDIR)\framecmn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\framecmn.cpp /BINARY framecmn.obj - -gdicmn.obj: $(COMMDIR)\gdicmn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\gdicmn.cpp /BINARY gdicmn.obj - -image.obj: $(COMMDIR)\image.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\image.cpp /BINARY image.obj - -intl.obj: $(COMMDIR)\intl.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\intl.cpp /BINARY intl.obj - -ipcbase.obj: $(COMMDIR)\ipcbase.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\ipcbase.cpp /BINARY ipcbase.obj - -helpbase.obj: $(COMMDIR)\helpbase.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\helpbase.cpp /BINARY helpbase.obj - -layout.obj: $(COMMDIR)\layout.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\layout.cpp /BINARY layout.obj - -log.obj: $(COMMDIR)\log.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\log.cpp /BINARY log.obj - -memory.obj: $(COMMDIR)\memory.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\memory.cpp /BINARY memory.obj - -mimetype.obj: $(COMMDIR)\mimetype.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\mimetype.cpp /BINARY mimetype.obj - -module.obj: $(COMMDIR)\module.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\module.cpp /BINARY module.obj - -object.obj: $(COMMDIR)\object.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\object.cpp /BINARY object.obj - -prntbase.obj: $(COMMDIR)\prntbase.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\prntbase.cpp /BINARY prntbase.obj - -resource.obj: $(COMMDIR)\resource.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\resource.cpp /BINARY resource.obj - -tbarbase.obj: $(COMMDIR)\tbarbase.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\tbarbase.cpp /BINARY tbarbase.obj - -tbarsmpl.obj: $(COMMDIR)\tbarsmpl.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\tbarsmpl.cpp /BINARY tbarsmpl.obj - -textfile.obj: $(COMMDIR)\textfile.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\textfile.cpp /BINARY textfile.obj - -timercmn.obj: $(COMMDIR)\timercmn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\timercmn.cpp /BINARY timercmn.obj - -utilscmn.obj: $(COMMDIR)\utilscmn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\utilscmn.cpp /BINARY utilscmn.obj - -validate.obj: $(COMMDIR)\validate.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\validate.cpp /BINARY validate.obj - -valgen.obj: $(COMMDIR)\valgen.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\valgen.cpp /BINARY valgen.obj - -valtext.obj: $(COMMDIR)\valtext.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\valtext.cpp /BINARY valtext.obj - -date.obj: $(COMMDIR)\date.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\date.cpp /BINARY date.obj - -wxexpr.obj: $(COMMDIR)\wxexpr.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wxexpr.cpp /BINARY wxexpr.obj - -hash.obj: $(COMMDIR)\hash.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\hash.cpp /BINARY hash.obj - -list.obj: $(COMMDIR)\list.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\list.cpp /BINARY list.obj - -paper.obj: $(COMMDIR)\paper.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\paper.cpp /BINARY paper.obj - -string.obj: $(COMMDIR)\string.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\string.cpp /BINARY string.obj - -socket.obj: $(COMMDIR)\socket.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\socket.cpp /BINARY socket.obj - -sckint.obj: $(COMMDIR)\sckint.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckint.cpp /BINARY sckint.obj - -sckaddr.obj: $(COMMDIR)\sckaddr.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckaddr.cpp /BINARY sckaddr.obj - -sckfile.obj: $(COMMDIR)\sckfile.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckfile.cpp /BINARY sckfile.obj - -sckipc.obj: $(COMMDIR)\sckipc.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckipc.cpp /BINARY sckipc.obj - -sckstrm.obj: $(COMMDIR)\sckstrm.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckstrm.cpp /BINARY sckstrm.obj - -url.obj: $(COMMDIR)\url.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\url.cpp /BINARY url.obj - -http.obj: $(COMMDIR)\http.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\http.cpp /BINARY http.obj - -protocol.obj: $(COMMDIR)\protocol.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\protocol.cpp /BINARY protocol.obj - -tokenzr.obj: $(COMMDIR)\tokenzr.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\tokenzr.cpp /BINARY tokenzr.obj - -matrix.obj: $(COMMDIR)\matrix.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\matrix.cpp /BINARY matrix.obj - -time.obj: $(COMMDIR)\time.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\time.cpp /BINARY time.obj - -stream.obj: $(COMMDIR)\stream.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\stream.cpp /BINARY stream.obj - -wfstream.obj: $(COMMDIR)\wfstream.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wfstream.cpp /BINARY wfstream.obj - -mstream.obj: $(COMMDIR)\mstream.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\mstream.cpp /BINARY mstream.obj - -zstream.obj: $(COMMDIR)\zstream.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\zstream.cpp /BINARY zstream.obj - -datstrm.obj: $(COMMDIR)\datstrm.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\datstrm.cpp /BINARY datstrm.obj - -objstrm.obj: $(COMMDIR)\objstrm.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\objstrm.cpp /BINARY objstrm.obj - -extended.obj: $(COMMDIR)\extended.c - $(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c /BINARY extended.obj - -process.obj: $(COMMDIR)\process.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\process.cpp /BINARY process.obj - -variant.obj: $(COMMDIR)\variant.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\variant.cpp /BINARY variant.obj - -wincmn.obj: $(COMMDIR)\wincmn.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wincmn.cpp /BINARY wincmn.obj - -wxchar.obj: $(COMMDIR)\wxcharp.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wxchar.cpp /BINARY wxchar.obj - -######################################################## -# Generic objects (not always compiled, depending on -# whether platforms have native implementations) - -choicdgg.obj: $(GENDIR)\choicdgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\choicdgg.cpp /BINARY choicdgg.obj - -colrdlgg.obj: $(GENDIR)\colrdgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\colrdgg.cpp /BINARY colordgg.obj - -dirdlgg.obj: $(GENDIR)\dirdlgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\dirdlgg.cpp /BINARY dirdlgg.obj - -fontdlgg.obj: $(GENDIR)\fontdlgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\fontdlgg.cpp /BINARY fontdlgg.obj - -gridg.obj: $(GENDIR)\gridg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\gridg.cpp /BINARY gridg.obj - -laywin.obj: $(GENDIR)\laywin.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\laywin.cpp /BINARY laywin.obj - -msgdlgg.obj: $(GENDIR)\msgdlgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\msgdlgg.cpp /BINARY msgdlgg.obj - -panelg.obj: $(GENDIR)\panelg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\panelg.cpp /BINARY panelg.obj - -printps.obj: $(GENDIR)\printps.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\printps.cpp /BINARY printps.obj - -progdlgg.obj: $(GENDIR)\progdlgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\progdlgg.cpp /BINARY progdlgg.obj - -prop.obj: $(GENDIR)\prop.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\prop.cpp /BINARY prop.obj - -propform.obj: $(GENDIR)\propform.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\propform.cpp /BINARY propform.obj - -proplist.obj: $(GENDIR)\proplist.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\proplist.cpp /BINARY proplist.obj - -prntdlgg.obj: $(GENDIR)\prntdlgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\prntdlgg.cpp /BINARY prntdlgg.obj - -sashwin.obj: $(GENDIR)\sashwin.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\sashwin.cpp /BINARY sashwin.obj - -scrolwin.obj: $(GENDIR)\scrolwin.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\scrolwin.cpp /BINARY scrolwin.obj - -splitter.obj: $(GENDIR)\splitter.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\splitter.cpp /BINARY splitter.obj - -statusbr.obj: $(GENDIR)\statusbr.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\statusbr.cpp /BINARY statusbr.obj - -tabg.obj: $(GENDIR)\tabg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\tabg.cpp /BINARY tabg.obj - -textdlgg.obj: $(GENDIR)\textdlgg.cpp - $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\textdlgg.cpp /BINARY textdlgg.obj - -crbuffri.obj: $(XPMDIR)\crbuffri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crbuffri.c - -crbuffrp.obj: $(XPMDIR)\crbuffrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crbuffrp.c - -crdatfri.obj: $(XPMDIR)\crdatfri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crdatfri.c - -crdatfrp.obj: $(XPMDIR)\crdatfrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crdatfrp.c - -create.obj: $(XPMDIR)\create.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\create.c - -crifrbuf.obj: $(XPMDIR)\crifrbuf.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crifrbuf.c - -crifrdat.obj: $(XPMDIR)\crifrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crifrdat.c - -crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crpfrbuf.c - -crpfrdat.obj: $(XPMDIR)\crpfrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crpfrdat.c - -dataxpm.obj: $(XPMDIR)\data.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\data.c /BINARY dataxpm.obj - -hashtab.obj: $(XPMDIR)\hashtab.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\hashtab.c - -misc.obj: $(XPMDIR)\misc.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\misc.c - -parse.obj: $(XPMDIR)\parse.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\parse.c - -rdftodat.obj: $(XPMDIR)\rdftodat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rdftodat.c - -rdftoi.obj: $(XPMDIR)\rdftoi.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rdftoi.c - -rdftop.obj: $(XPMDIR)\rdftop.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rdftop.c - -rgb.obj: $(XPMDIR)\rgb.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rgb.c - -scan.obj: $(XPMDIR)\scan.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\scan.c - -simx.obj: $(XPMDIR)\simx.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\simx.c - -wrffrdat.obj: $(XPMDIR)\wrffrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\wrffrdat.c - -wrffri.obj: $(XPMDIR)\wrffri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\wrffri.c - -wrffrp.obj: $(XPMDIR)\wrffrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\wrffrp.c - -OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ - trees$(O) -OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ - infutil$(O) inffast$(O) - -adler32.obj: adler32.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -compress.obj: compress.c zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -crc32.obj: crc32.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -gzio.obj: gzio.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\ - infcodes.h infutil.h - $(CC) -c $(CFLAGS) $*.c - -infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\ - infcodes.h inffast.h - $(CC) -c $(CFLAGS) $*.c - -inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h - $(CC) -c $(CFLAGS) $*.c - -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h - $(CC) -c $(CFLAGS) $*.c - -infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h - $(CC) -c $(CFLAGS) $*.c - -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h - $(CC) -c $(CFLAGS) $*.c - -trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -uncompr.obj: uncompr.c zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -zutil.obj: zutil.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - - -y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - $(CC) /ANSI_C $(CPPFLAGS) $(IFLAGS) /DEFINE USE_DEFINE $(COMMDIR)\y_tab.c /BINARY y_tab.obj - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - -xpm: - cd $(WXDIR)\src\xpm - wmake -f makefile.wat all - cd $(WXDIR)\src\msw - -clean_xpm: - cd $(WXDIR)\src\xpm - wmake -f makefile.wat clean - cd $(WXDIR)\src\msw - -png: - cd $(WXDIR)\src\png - wmake -f makefile.wat all - cd $(WXDIR)\src\msw - -clean_png: - cd $(WXDIR)\src\png - wmake -f makefile.wat clean - cd $(WXDIR)\src\msw - -zlib: - cd $(WXDIR)\src\zlib - wmake -f makefile.wat all - cd $(WXDIR)\src\msw - -clean_zlib: - cd $(WXDIR)\src\zlib - wmake -f makefile.wat clean - cd $(WXDIR)\src\msw - -