From 26ed67330e897807b769a875caa5c4ee27336156 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Tue, 25 Feb 2003 13:17:04 +0000 Subject: [PATCH] fix for open watcom git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/wat.t | 93 +- include/wx/msw/missing.h | 2 +- include/wx/msw/setup0.h | 2 +- samples/minimal/makefile.wat | 7 +- src/common/imagjpeg.cpp | 5 +- src/common/imagpng.cpp | 12 +- src/jpeg/makefile.wat | 135 +-- src/makelib.wat | 36 +- src/makeprog.wat | 55 +- src/makewat.env | 192 +++- src/msw/makefile.wat | 1850 +++++++++++++++++----------------- src/png/makefile.wat | 42 +- src/regex/makefile.wat | 25 +- src/tiff/makefile.wat | 100 +- src/tiff/tif_lzw.c | 2 +- src/tiff/tif_predict.c | 2 +- src/zlib/makefile.wat | 126 +-- 17 files changed, 1374 insertions(+), 1312 deletions(-) diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t index e6d9f58f73..6c594f4eba 100644 --- a/distrib/msw/tmake/wat.t +++ b/distrib/msw/tmake/wat.t @@ -2,13 +2,10 @@ #! File: wat.t #! Purpose: tmake template file from which makefile.wat is generated by running #! tmake -t wat wxwin.pro -o makefile.wat -#! TODO: -#! - extended.c, unzip.c must be compiled with $(CC), not $(CCC). -#! - extended.c, unzip.c targets must be as per b32.t etc. -#! - OLE files not generated correctly (need 'ole/' directory) #! Author: Vadim Zeitlin #! Created: 14.07.99 #! Version: $Id$ +#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch #!############################################################################# #${ #! include the code which parses filelist.txt file and initializes @@ -49,7 +46,7 @@ #! these files don't compile next if $file =~ /^pnghand\./; -#! next if $wxGeneric{$file} =~ /\b16\b/; + next if $wxMSW{$file} =~ /\b16\b/; my $isOleObj = $wxMSW{$file} =~ /\bO\b/; my $isCFile = $file =~ /\.c$/; @@ -71,25 +68,9 @@ # Created: 1998 # # Makefile : Builds wxWindows library for Watcom C++, WIN32 -# -# NOTE: This file is generated from wat.t by tmake, but not all bugs have -# been removed from this process. If wxWindows doesn't compile, -# check the following and edit this makefile accordingly: -# -# - OLE-related files such as oleutils.cpp should have 'ole\' prepended -# to the path. -# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC). -# They may also be wrongly specified as extended.cpp, etc. +!include ..\makewat.env -WXDIR = ..\.. - -!include $(WXDIR)\src\makewat.env - -WXLIB = $(WXDIR)\lib - -LIBTARGET = $(WXLIB)\wx.lib -DUMMY=dummydll -# ODBCLIB = ..\..\contrib\odbc\odbc32.lib +LIBTARGET = $(WXDIR)\lib\$(LIBNAME).lib EXTRATARGETS = png zlib jpeg tiff regex EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex @@ -103,44 +84,42 @@ HTMLDIR=$(WXDIR)\src\html DOCDIR = $(WXDIR)\docs -GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "", " &\n\t") +GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") # 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= #$ ExpandGlue("WXNONESSENTIALOBJS", "", " &\n\t") +NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") COMMONOBJS = & - y_tab.obj & - #$ ExpandGlue("WXCOMMONOBJS", "", " &\n\t") + $(OUTPUTDIR)\y_tab.obj & + #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") -MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t") +MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") -HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t") +HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -ARCHINCDIR=$(WXDIR)\lib\msw SETUP_H=$(ARCHINCDIR)\wx\setup.h -all: $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC +all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC $(ARCHINCDIR)\wx: - mkdir $(ARCHINCDIR) - mkdir $(ARCHINCDIR)\wx + mkdir $(ARCHINCDIR) + mkdir $(ARCHINCDIR)\wx + +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx - copy $(WXDIR)\include\wx\msw\setup.h $@ + copy $(WXDIR)\include\wx\msw\setup.h $@ +LBCFILE=wx$(TOOLKIT).lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc - -#test : $(OBJECTS) -# %create tmp.lbc -# @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i -# wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE) clean: .SYMBOLIC $(EXTRATARGETSCLEAN) @@ -156,7 +135,7 @@ cleanall: clean $_ = $project{"WXMSWOBJS"}; my @objs = split; foreach (@objs) { - $text .= $_ . ': $('; + $text .= "\$(OUTPUTDIR)\\" . $_ . ': $('; s/\.obj$//; if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) { $text .= 'OLEDIR)\\'; @@ -167,13 +146,15 @@ cleanall: clean if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) { $suffix = "c"; $cc="CC"; + $flags="CFLAGS"; } else { $suffix = "cpp"; - $cc="CCC"; + $cc="CXX"; + $flags="CXXFLAGS"; } $text .= $_ . ".$suffix\n" . - " *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n"; + " *\$($cc) \$($flags) \$<" . "\n\n"; } #$} @@ -184,27 +165,27 @@ cleanall: clean $_ = $project{"WXCOMMONOBJS"}; my @objs = split; foreach (@objs) { - $text .= $_; + $text .= "\$(OUTPUTDIR)\\" . $_; s/\.obj$//; $text .= ': $(COMMDIR)\\'; my $suffix, $cc; if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) { $suffix = "c"; $cc="CC"; + $flags="CFLAGS"; } else { $suffix = "cpp"; - $cc="CCC"; + $cc="CXX"; + $flags="CXXFLAGS"; } $text .= $_ . ".$suffix\n" . - " *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n"; + " *\$($cc) \$($flags) \$<" . "\n\n"; } #$} -y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c - -# *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c +$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c + *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c $(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c @@ -220,11 +201,11 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c $_ = $project{"WXGENERICOBJS"}; my @objs = split; foreach (@objs) { - $text .= $_; + $text .= "\$(OUTPUTDIR)\\" . $_; s/\.obj$//; $text .= ': $(GENDIR)\\'; $text .= $_ . ".cpp\n" . - ' *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n"; + ' *$(CXX) $(CXXFLAGS) $<' . "\n\n"; } #$} @@ -236,11 +217,11 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c $_ = $project{"WXHTMLOBJS"}; my @objs = split; foreach (@objs) { - $text .= $_; + $text .= "\$(OUTPUTDIR)\\" . $_; s/\.obj$//; $text .= ': $(HTMLDIR)\\'; $text .= $_ . ".cpp\n" . - ' *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n"; + ' *$(CXX) $(CXXFLAGS) $<' . "\n\n"; } #$} diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index 32413eebaf..4486636399 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -159,7 +159,7 @@ typedef struct tagNMLVDISPINFOW { #endif #endif -#if (defined(__GNUWIN32__) || defined(__BORLANDC__)) && !defined(HDN_GETDISPINFOW) +#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__)) && !defined(HDN_GETDISPINFOW) #define HDN_GETDISPINFOW (HDN_FIRST-29) #if !wxCHECK_W32API_VERSION(2, 2) typedef struct { diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 3447c5ca4f..c7078b5231 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1064,7 +1064,7 @@ // ---------------------------------------------------------------------------- #ifndef wxUSE_NORLANDER_HEADERS -#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) # define wxUSE_NORLANDER_HEADERS 1 #else # define wxUSE_NORLANDER_HEADERS 0 diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index 2b200ba7ec..5403a604f8 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -5,11 +5,10 @@ # # -WXDIR = $(%WXWIN) +OUTPUTDIR = Watcom PROGRAM = minimal -OBJECTS = $(PROGRAM).obj - -!include $(WXDIR)\src\makeprog.wat +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj +!include $(%WXWIN)\src\makeprog.wat diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index c2525bae43..b1e8b9e3de 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -28,11 +28,12 @@ #include "wx/log.h" #include "wx/app.h" -// NB: Some compilers define boolean type in Windows headers (e.g. Watcom C++). +// NB: Some compilers define boolean type in Windows headers +// (e.g. Watcom C++, but not Open Watcom). // This causes a conflict with jmorecfg.h header from libjpeg, so we have // to make sure libjpeg won't try to define boolean itself. This is done by // defining HAVE_BOOLEAN. -#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__WATCOMC__)) +#if defined(__WXMSW__) && (defined(__MWERKS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200)) #define HAVE_BOOLEAN #include #endif diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 7e33316411..45dd9c46ca 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -57,7 +57,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if wxUSE_LIBPNG #ifndef PNGLINKAGEMODE - #define PNGLINKAGEMODE LINKAGEMODE + #ifdef __WATCOMC__ + // we need an explicit cdecl for Watcom, at least according to + // + // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863 + // + // more testing is needed for this however, please remove this comment + // if you can confirm that my fix works with Watcom 11 + #define PNGLINKAGEMODE cdecl + #else + #define PNGLINKAGEMODE LINKAGEMODE + #endif #endif diff --git a/src/jpeg/makefile.wat b/src/jpeg/makefile.wat index d1f309c5b3..88ed70b0c4 100644 --- a/src/jpeg/makefile.wat +++ b/src/jpeg/makefile.wat @@ -3,6 +3,7 @@ # File: makefile.wat # Author: Julian Smart # Created: 1998 +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch # # Makefile : Builds JPEG library for Watcom C++, WIN32 @@ -13,81 +14,83 @@ EXTRACPPFLAGS=-i=..\zlib WXLIB = $(WXDIR)\lib -LIBTARGET = $(WXLIB)\jpeg.lib +LIBTARGET = $(WXLIB)\jpeg$(WATCOM_SUFFIX).lib -SYSDEPMEM= jmemnobs.obj - -# source files: JPEG library proper -LIBSOURCES= jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c & - jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c & - jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c & - jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c & - jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c & - jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c & - jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c & - jquant2.c jutils.c jmemmgr.c -# memmgr back ends: compile only one of these into a working library -SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c -# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom -APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c & - rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c & - rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c -SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES) -# files included by source files -INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h & - jpegint.h jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h -# documentation, test, and support files -DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 & - wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc & - coderules.doc filelist.doc change.log -MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc & - makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds & - makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st & - maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms & - makvms.opt -CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat & - jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas & - jconfig.vms -CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh -OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm -TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg & - testimgp.jpg -DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) & - $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES) # library object files common to compression and decompression -COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM) +COMOBJECTS = & + $(OUTPUTDIR)\jcomapi.obj & + $(OUTPUTDIR)\jutils.obj & + $(OUTPUTDIR)\jerror.obj & + $(OUTPUTDIR)\jmemmgr.obj & + $(OUTPUTDIR)\jmemnobs.obj + # compression library object files -CLIBOBJECTS= jcapimin.obj jcapistd.obj jctrans.obj jcparam.obj jdatadst.obj & - jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj jcprepct.obj & - jccoefct.obj jccolor.obj jcsample.obj jchuff.obj jcphuff.obj & - jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj +CLIBOBJECTS = & + $(OUTPUTDIR)\jcapimin.obj & + $(OUTPUTDIR)\jcapistd.obj & + $(OUTPUTDIR)\jctrans.obj & + $(OUTPUTDIR)\jcparam.obj & + $(OUTPUTDIR)\jdatadst.obj & + $(OUTPUTDIR)\jcinit.obj & + $(OUTPUTDIR)\jcmaster.obj & + $(OUTPUTDIR)\jcmarker.obj & + $(OUTPUTDIR)\jcmainct.obj & + $(OUTPUTDIR)\jcprepct.obj & + $(OUTPUTDIR)\jccoefct.obj & + $(OUTPUTDIR)\jccolor.obj & + $(OUTPUTDIR)\jcsample.obj & + $(OUTPUTDIR)\jchuff.obj & + $(OUTPUTDIR)\jcphuff.obj & + $(OUTPUTDIR)\jcdctmgr.obj & + $(OUTPUTDIR)\jfdctfst.obj & + $(OUTPUTDIR)\jfdctflt.obj & + $(OUTPUTDIR)\jfdctint.obj + # decompression library object files -DLIBOBJECTS= jdapimin.obj jdapistd.obj jdtrans.obj jdatasrc.obj & - jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdphuff.obj & - jdmainct.obj jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj & - jidctflt.obj jidctint.obj jidctred.obj jdsample.obj jdcolor.obj & - jquant1.obj jquant2.obj jdmerge.obj +DLIBOBJECTS = & + $(OUTPUTDIR)\jdapimin.obj & + $(OUTPUTDIR)\jdapistd.obj & + $(OUTPUTDIR)\jdtrans.obj & + $(OUTPUTDIR)\jdatasrc.obj & + $(OUTPUTDIR)\jdmaster.obj & + $(OUTPUTDIR)\jdinput.obj & + $(OUTPUTDIR)\jdmarker.obj & + $(OUTPUTDIR)\jdhuff.obj & + $(OUTPUTDIR)\jdphuff.obj & + $(OUTPUTDIR)\jdmainct.obj & + $(OUTPUTDIR)\jdcoefct.obj & + $(OUTPUTDIR)\jdpostct.obj & + $(OUTPUTDIR)\jddctmgr.obj & + $(OUTPUTDIR)\jidctfst.obj & + $(OUTPUTDIR)\jidctflt.obj & + $(OUTPUTDIR)\jidctint.obj & + $(OUTPUTDIR)\jidctred.obj & + $(OUTPUTDIR)\jdsample.obj & + $(OUTPUTDIR)\jdcolor.obj & + $(OUTPUTDIR)\jquant1.obj & + $(OUTPUTDIR)\jquant2.obj & + $(OUTPUTDIR)\jdmerge.obj + # These objectfiles are included in libjpeg.lib -OBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS) -# object files for sample applications (excluding library files) -COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj & - rdswitch.obj cdjpeg.obj -DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj & - rdcolmap.obj cdjpeg.obj -TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj -all: $(OBJECTS) $(LIBTARGET) +OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS) +all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC + +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ + +LBCFILE=$(OUTPUTDIR)\jpeg.lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) -clean: .SYMBOLIC - -erase *.obj +clean: .SYMBOLIC + -erase $(OUTPUTDIR)\*.obj -erase $(LIBTARGET) - -erase *.pch - -erase *.err - -erase *.lbc + -erase $(OUTPUTDIR)\*.pch + -erase $(OUTPUTDIR)\*.err + -erase $(OUTPUTDIR)\*.lbc cleanall: clean diff --git a/src/makelib.wat b/src/makelib.wat index 74cc16dc7b..3c6bcce4cd 100644 --- a/src/makelib.wat +++ b/src/makelib.wat @@ -1,26 +1,30 @@ -WXDIR = $(%WXWIN) +# +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch +# !include $(WXDIR)\src\makewat.env -WXLIB = $(WXDIR)\lib -LNK = tmp.lbc +all: $(OUTPUTDIR) $(LIBTARGET) -all: $(LIBTARGET) +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ +# the name of the file containing the objects to be put in the library +LBCFILE=$(OUTPUTDIR)$(LIBTARGET).lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + $(LIB) /b /c /n /p=512 $^@ @$(LBCFILE) clean: .SYMBOLIC - -erase *.obj - -erase *.bak - -erase *.err - -erase *.pch - -erase *.lib - -erase *.lbc - -erase *.res - -erase *.exe - -erase *.lbc + -erase $(OUTPUTDIR)*.obj + -erase $(OUTPUTDIR)*.bak + -erase $(OUTPUTDIR)*.err + -erase $(OUTPUTDIR)*.pch + -erase $(OUTPUTDIR)*.lib + -erase $(OUTPUTDIR)*.lbc + -erase $(OUTPUTDIR)*.res + -erase $(OUTPUTDIR)*.exe + -erase $(OUTPUTDIR)*.lbc -erase $(LIBTARGET) diff --git a/src/makeprog.wat b/src/makeprog.wat index 99b984842e..3e0742c21b 100644 --- a/src/makeprog.wat +++ b/src/makeprog.wat @@ -1,39 +1,56 @@ +# +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch +# + WXDIR = $(%WXWIN) !include $(WXDIR)\src\makewat.env WXLIB = $(WXDIR)\lib -LNK = $(PROGRAM).lnk +LNK = $(OUTPUTDIR)\$(PROGRAM).lnk -all: $(PROGRAM).exe $(EXTRATARGETS) +all: $(OUTPUTDIR) $(OUTPUTDIR)\$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC -$(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ + +!ifeq wxUSE_GUI 0 +RESFILE= +!else +RESFILE=$(OUTPUTDIR)\$(PROGRAM).res +!endif + +$(OUTPUTDIR)\$(PROGRAM).exe : $(OBJECTS) $(RESFILE) $(LNK) $(WXLIB)\$(LIBNAME).lib wlink @$(LNK) - $(BINDCOMMAND) $(PROGRAM).res +!ifneq wxUSE_GUI 0 + $(BINDCOMMAND) $(RESFILE) +!endif -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(RC) $(RESFLAGS1) $(PROGRAM).rc +!ifneq wxUSE_GUI 0 +$(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc + $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc +!endif $(LNK) : makefile.wat %create $(LNK) - @%append $(LNK) debug all - @%append $(LNK) system $(LINKOPTION) + @%append $(LNK) $(LDFLAGS) + @%append $(LNK) $(DEBUGINFO) + @%append $(LNK) system $(LINKSYSTEM) @%append $(LNK) $(STACK) - @%append $(LNK) name $(PROGRAM).exe + @%append $(LNK) name $(OUTPUTDIR)\$(PROGRAM).exe @for %i in ($(OBJECTS)) do @%append $(LNK) file %i @for %i in ($(LIBS)) do @%append $(LNK) lib %i @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i -# @%append $(LNK) $(MINDATA) -# @%append $(LNK) $(MAXDATA) clean: .SYMBOLIC - -erase *.obj - -erase *.bak - -erase *.err - -erase *.pch - -erase *.lib + -erase $(OUTPUTDIR)\*.obj + -erase $(OUTPUTDIR)\*.bak + -erase $(OUTPUTDIR)\*.err + -erase $(OUTPUTDIR)\*.pch + -erase $(OUTPUTDIR)\*.lib -erase $(LNK) - -erase *.res - -erase *.exe - -erase *.lbc + -erase $(OUTPUTDIR)\*.res + -erase $(OUTPUTDIR)\*.exe + -erase $(OUTPUTDIR)\*.lbc + -rmdir $(OUTPUTDIR) diff --git a/src/makewat.env b/src/makewat.env index b12d76e5d9..a5ddc677b9 100644 --- a/src/makewat.env +++ b/src/makewat.env @@ -1,95 +1,177 @@ -# File: makewat.env +############################################################################### +# File: src/makewat.env # Purpose: Watcom environments for wxWindows makefiles. # Author: Julian Smart and others -# -# The main things to change are: +# Version: $Id$ +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch +############################################################################### + +# The following environment variables must be set: # # WATCOM: set to where the compiler is installed -# WXDIR: set to where the wxWindows is installed -# MODE: set to windows [16 bit windows], nt [win32s], or win386 [32-bit non-WIN32] +# WXWIN: set to where the wxWindows is installed +# PATH: set correctly, i.e. contains all Watcom directories +# LIB: same as PATH +# INCLUDE: same as PATH +# set wxUSE_GUI=0 to build wxBase instead of (default) wxMSW +!ifndef wxUSE_GUI +wxUSE_GUI=1 +!endif + +# set FINAL=1 to disable debug and enable optimizations +!ifndef FINAL FINAL=0 -WATCOMDIR=$(%WATCOM) +!endif + +# set WATCOM_SUFFIX to nothing if you use only Watcom compiler, set it to +# something Watcom-specific if you want to build wxWindows with more than one +# compiler +WATCOM_SUFFIX=_w + +# change/remove this if you want to create programs for older Windows versions, +# increase the version to be able to use more Win2K+-only features +WINVERFLAGS = /dWINVER=0x400 /d_WIN32_IE=0x0300 + +# optimize for space/time: /os or /ot +!ifeq FINAL 1 +OPTFLAGS=/oails /5r +!else +OPTFLAGS=/od +!endif + + +############################################################################### +# You shouldn't have to modify anything after this point +############################################################################### .EXTENSIONS: .EXTENSIONS: .exe .obj .c .cc .cpp .res .rc .def -#WXDIR = d:\wx2\wxwind~1 +!ifndef %WATCOM +!error WATCOM environment variable must be set! +!endif +WATCOMDIR=$(%WATCOM) + +!ifndef %WXWIN +!error WXWIN environment variable must be set! +!endif WXDIR = $(%WXWIN) -WXINC = $(WXDIR)\include # Suffixes OBJSUFF=obj SRCSUFF=cpp +!ifeq FINAL 1 WXDEBUG=0 - -!ifneq NOPRECOMP 1 -PRECOMP = /fh=$(WXDIR)\src\msw\watcom.pch +!else +WXDEBUG=1 !endif !ifeq WXDEBUG 1 -DEBUGFLAGS = /D__WXDEBUG__ /o1 +DEBUGFLAGS = /D__WXDEBUG__ +DEBUGCFLAGS = $(DEBUGFLAGS) /d2 +DEBUGCXXFLAGS = $(DEBUGFLAGS) /d2i DEBUGINFO = debug all +DEBUGSUFFIX = d !else -DEBUGFLAGS = +DEBUGCFLAGS = +DEBUGCXXFLAGS = DEBUGINFO = +DEBUGSUFFIX = !endif -RC = wrc +# TOOLKIT is used as the name of lib subdir containing wx/setup.h +# BASEDIRPREFIX is used to construct OUTPUTDIR +!ifeq wxUSE_GUI 0 +TOOLKIT = base +BASEDIRPREFIX = Base +LINKSYSTEM = nt +!else +TOOLKIT = msw +LINKSYSTEM = nt_win +BASEDIRPREFIX = +!endif +ARCHINCDIR=$(WXDIR)\lib\$(TOOLKIT)$(DEBUGSUFFIX) + +# set the things which depend on debug/release +# +# note that the values for LIBPAGESIZE are minimal possible, the library +# doesn't link (Error! Library too large) with values smaller than given +!ifeq FINAL 1 +CONFIGURATION=Release +LIBPAGESIZE=/p=1024 +!else +CONFIGURATION=Debug +LIBPAGESIZE=/p=2048 +!endif + +# set OUTPUTDIR to the directory to be used for the .obj files created during +# the build (under $WXWIN) +!ifndef OUTPUTDIR +OUTPUTDIR=$(WXDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom +# no trailing slash for win98 +!endif + +!ifneq NOPRECOMP 1 +PRECOMP = /fh=$(OUTPUTDIR)\watcom.pch +!endif + +# the basename of the library +LIBNAME=wx$(TOOLKIT)$(DEBUGSUFFIX)$(WATCOM_SUFFIX) + +# only LEVEL=386 is currently supported, 16 bit compilation is probably broken LEVEL = 386 -CCC = wpp$(LEVEL) -CC = wcc$(LEVEL) -OS_TARGET = nt_win -MODEL = -# If you use win95, assumptions will be made about Win95 icon format etc. -# so nt_win is probably better for simultaneous Win32s/Win95/NT operation. -LINKOPTION = nt_win # win95 -WINVERFLAGS = /dWINVER=0x400 /d__WIN95__ +CXX = wpp$(LEVEL) +CC = wcc$(LEVEL) +LIB = wlib /q +RC = wrc BINDCOMMAND = wrc WATLIBDIR = $(WATCOMDIR)\lib386\nt -MINDATA = -MAXDATA = STACK = option stack=64k -LIBS = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib & - $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib & - $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\opengl32.lib & - $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib -IFLAGS = -i=$(WXDIR)\lib\msw -i=$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff;$(WXDIR)\include\wx\msw\gnuwin32 -RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVERFLAGS) -RESFLAGS2 = -R $(name) /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVERFLAGS) +LIBS = $(WXDIR)\lib\$(LIBNAME).lib & + $(WXDIR)\lib\regex$(WATCOM_SUFFIX).lib & + $(WXDIR)\lib\zlib$(WATCOM_SUFFIX).lib & +!ifneq wxUSE_GUI 0 + $(WXDIR)\lib\png$(WATCOM_SUFFIX).lib & + $(WXDIR)\lib\tiff$(WATCOM_SUFFIX).lib & + $(WXDIR)\lib\jpeg$(WATCOM_SUFFIX).lib & +!endif + $(WATLIBDIR)\comctl32.lib & + $(WATLIBDIR)\comdlg32.lib & + $(WATLIBDIR)\odbc32.lib & + $(WATLIBDIR)\ole32.lib & + $(WATLIBDIR)\oleaut32.lib & + $(WATLIBDIR)\opengl32.lib & + $(WATLIBDIR)\uuid.lib +IFLAGS = -i=$(ARCHINCDIR);$(WXDIR)\include & + -i=$(%watcom)\h;$(%watcom)\h\nt & + -i=$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff & + -i=$(WXDIR)\include\wx\msw\gnuwin32 +RESFLAGS = -q -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVERFLAGS) -# Here are some possible optimization flags: -# /5r Pentium timings -# /fp5 /fpi87 Inline 80x87 instructions optimized for Pentium: coprocessor must be present -# /ox Standard optimizations -# /or Reordering for Pentium timings (included in /ox) -# The Watcom-recommended flags for optimum Pentium speed are: -# /oneatx /zp4 /5 /fpi87 /fp5 - -OPTFLAGS=/ox /5r - -# /d1 for line numbers only: anything else produces an enormous wx32.lib -# # NB: /bm switch is needed for thread-safe runtime, if you don't use # wxThread you may remove it -CPPFLAGS = /bt=nt /w1 /DWIN32 /bm /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) $(DEBUGFLAGS) /d__WXMSW__ $(WINVERFLAGS) $(EXTRACPPFLAGS) # /d__WATCOMC__ +CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR)\ /fr /zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS) +!ifeq wxUSE_GUI 0 +CPPFLAGS += /dwxUSE_GUI=0 +!endif + +# zm and zv as well as the liker options below are used to make the resulting +# .exe smaller +CFLAGS = $(CPPFLAGS) $(DEBUGCFLAGS) $(EXTRACFLAGS) /zm +CXXFLAGS = $(CPPFLAGS) $(DEBUGCXXFLAGS) $(PRECOMP) /zm /zv /w=8 $(EXTRACXXFLAGS) +LDFLAGS = option eliminate, vfremoval .cpp.obj: # $< # .AUTODEPEND - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + *$(CXX) $(CXXFLAGS) $< .c.obj: # $< # .AUTODEPEND - *$(CC) $(CPPFLAGS) $(IFLAGS) $< + *$(CC) $(CFLAGS) $< -# This doesn't work for wcc -# %create tmp.lbc -# @%append tmp.lbc $(CPPFLAGS) $(IFLAGS) $< -# echo $< -# $(CC) @tmp.lbc - -dummy: .SYMBOLIC - @echo Please give a target for wxWin makefiles: the usual one is 'all'. +defaulttarget: all .SYMBOLIC erasepch: .SYMBOLIC - -erase $(WXDIR)\src\msw\watcom.pch + -erase $(OUTPUTDIR)\watcom.pch + diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index c752958bfe..07e3a525c6 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -9,25 +9,9 @@ # Created: 1998 # # Makefile : Builds wxWindows library for Watcom C++, WIN32 -# -# NOTE: This file is generated from wat.t by tmake, but not all bugs have -# been removed from this process. If wxWindows doesn't compile, -# check the following and edit this makefile accordingly: -# -# - OLE-related files such as oleutils.cpp should have 'ole\' prepended -# to the path. -# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC). -# They may also be wrongly specified as extended.cpp, etc. +!include ..\makewat.env -WXDIR = ..\.. - -!include $(WXDIR)\src\makewat.env - -WXLIB = $(WXDIR)\lib - -LIBTARGET = $(WXLIB)\wx.lib -DUMMY=dummydll -# ODBCLIB = ..\..\contrib\odbc\odbc32.lib +LIBTARGET = $(WXDIR)\lib\$(LIBNAME).lib EXTRATARGETS = png zlib jpeg tiff regex EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex @@ -41,353 +25,348 @@ HTMLDIR=$(WXDIR)\src\html DOCDIR = $(WXDIR)\docs -GENERICOBJS= busyinfo.obj & - calctrl.obj & - choicdgg.obj & - dcbuffer.obj & - dcpsg.obj & - dirctrlg.obj & - dragimgg.obj & - grid.obj & - gridctrl.obj & - gridsel.obj & - laywin.obj & - logg.obj & - numdlgg.obj & - panelg.obj & - progdlgg.obj & - prop.obj & - propform.obj & - proplist.obj & - sashwin.obj & - scrlwing.obj & - spinctlg.obj & - splash.obj & - splitter.obj & - statusbr.obj & - tbarsmpl.obj & - textdlgg.obj & - tipdlg.obj & - tipwin.obj & - treectlg.obj & - treelay.obj & - wizard.obj +GENERICOBJS= $(OUTPUTDIR)\busyinfo.obj & + $(OUTPUTDIR)\calctrl.obj & + $(OUTPUTDIR)\choicdgg.obj & + $(OUTPUTDIR)\dcbuffer.obj & + $(OUTPUTDIR)\dcpsg.obj & + $(OUTPUTDIR)\dirctrlg.obj & + $(OUTPUTDIR)\dragimgg.obj & + $(OUTPUTDIR)\grid.obj & + $(OUTPUTDIR)\gridctrl.obj & + $(OUTPUTDIR)\gridsel.obj & + $(OUTPUTDIR)\laywin.obj & + $(OUTPUTDIR)\logg.obj & + $(OUTPUTDIR)\numdlgg.obj & + $(OUTPUTDIR)\panelg.obj & + $(OUTPUTDIR)\progdlgg.obj & + $(OUTPUTDIR)\prop.obj & + $(OUTPUTDIR)\propform.obj & + $(OUTPUTDIR)\proplist.obj & + $(OUTPUTDIR)\sashwin.obj & + $(OUTPUTDIR)\scrlwing.obj & + $(OUTPUTDIR)\spinctlg.obj & + $(OUTPUTDIR)\splash.obj & + $(OUTPUTDIR)\splitter.obj & + $(OUTPUTDIR)\statusbr.obj & + $(OUTPUTDIR)\tbarsmpl.obj & + $(OUTPUTDIR)\textdlgg.obj & + $(OUTPUTDIR)\tipdlg.obj & + $(OUTPUTDIR)\tipwin.obj & + $(OUTPUTDIR)\treectlg.obj & + $(OUTPUTDIR)\treelay.obj & + $(OUTPUTDIR)\wizard.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= accel.obj & - caret.obj & - colrdlgg.obj & - dirdlgg.obj & - fdrepdlg.obj & - filedlgg.obj & - fontdlgg.obj & - helpext.obj & - helphtml.obj & - imaglist.obj & - listctrl.obj & - mdig.obj & - msgdlgg.obj & - notebook.obj & - paletteg.obj & - printps.obj & - prntdlgg.obj & - statline.obj & - tabg.obj & - timer.obj +NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj & + $(OUTPUTDIR)\caret.obj & + $(OUTPUTDIR)\colrdlgg.obj & + $(OUTPUTDIR)\dirdlgg.obj & + $(OUTPUTDIR)\fdrepdlg.obj & + $(OUTPUTDIR)\filedlgg.obj & + $(OUTPUTDIR)\fontdlgg.obj & + $(OUTPUTDIR)\helpext.obj & + $(OUTPUTDIR)\helphtml.obj & + $(OUTPUTDIR)\imaglist.obj & + $(OUTPUTDIR)\listctrl.obj & + $(OUTPUTDIR)\mdig.obj & + $(OUTPUTDIR)\msgdlgg.obj & + $(OUTPUTDIR)\notebook.obj & + $(OUTPUTDIR)\paletteg.obj & + $(OUTPUTDIR)\printps.obj & + $(OUTPUTDIR)\prntdlgg.obj & + $(OUTPUTDIR)\statline.obj & + $(OUTPUTDIR)\tabg.obj & + $(OUTPUTDIR)\timer.obj COMMONOBJS = & - y_tab.obj & - appcmn.obj & - artprov.obj & - artstd.obj & - choiccmn.obj & - clipcmn.obj & - clntdata.obj & - cmdline.obj & - cmdproc.obj & - cmndata.obj & - config.obj & - containr.obj & - cshelp.obj & - ctrlcmn.obj & - ctrlsub.obj & - datetime.obj & - datstrm.obj & - db.obj & - dbgrid.obj & - dbtable.obj & - dcbase.obj & - dircmn.obj & - dlgcmn.obj & - dndcmn.obj & - dobjcmn.obj & - docmdi.obj & - docview.obj & - dseldlg.obj & - dynarray.obj & - dynlib.obj & - dynload.obj & - effects.obj & - encconv.obj & - event.obj & - extended.obj & - fddlgcmn.obj & - ffile.obj & - file.obj & - fileconf.obj & - filefn.obj & - filename.obj & - filesys.obj & - fontcmn.obj & - fontmap.obj & - framecmn.obj & - fs_inet.obj & - fs_mem.obj & - fs_zip.obj & - ftp.obj & - gaugecmn.obj & - gdicmn.obj & - geometry.obj & - gifdecod.obj & - hash.obj & - hashmap.obj & - helpbase.obj & - http.obj & - iconbndl.obj & - imagall.obj & - imagbmp.obj & - image.obj & - imagfill.obj & - imaggif.obj & - imagiff.obj & - imagjpeg.obj & - imagpcx.obj & - imagpng.obj & - imagpnm.obj & - imagtiff.obj & - imagxpm.obj & - intl.obj & - ipcbase.obj & - layout.obj & - lboxcmn.obj & - list.obj & - log.obj & - longlong.obj & - matrix.obj & - memory.obj & - menucmn.obj & - mimecmn.obj & - module.obj & - msgout.obj & - mstream.obj & - nbkbase.obj & - object.obj & - odbc.obj & - paper.obj & - popupcmn.obj & - prntbase.obj & - process.obj & - protocol.obj & - quantize.obj & - radiocmn.obj & - regex.obj & - resource.obj & - sckaddr.obj & - sckfile.obj & - sckipc.obj & - sckstrm.obj & - settcmn.obj & - sizer.obj & - socket.obj & - statbar.obj & - strconv.obj & - stream.obj & - string.obj & - sysopt.obj & - tbarbase.obj & - textbuf.obj & - textcmn.obj & - textfile.obj & - timercmn.obj & - tokenzr.obj & - toplvcmn.obj & - treebase.obj & - txtstrm.obj & - unzip.obj & - url.obj & - utilscmn.obj & - valgen.obj & - validate.obj & - valtext.obj & - variant.obj & - wfstream.obj & - wincmn.obj & - wxchar.obj & - wxexpr.obj & - xpmdecod.obj & - zipstrm.obj & - zstream.obj + $(OUTPUTDIR)\y_tab.obj & + $(OUTPUTDIR)\appcmn.obj & + $(OUTPUTDIR)\artprov.obj & + $(OUTPUTDIR)\artstd.obj & + $(OUTPUTDIR)\choiccmn.obj & + $(OUTPUTDIR)\clipcmn.obj & + $(OUTPUTDIR)\clntdata.obj & + $(OUTPUTDIR)\cmdline.obj & + $(OUTPUTDIR)\cmdproc.obj & + $(OUTPUTDIR)\cmndata.obj & + $(OUTPUTDIR)\config.obj & + $(OUTPUTDIR)\containr.obj & + $(OUTPUTDIR)\cshelp.obj & + $(OUTPUTDIR)\ctrlcmn.obj & + $(OUTPUTDIR)\ctrlsub.obj & + $(OUTPUTDIR)\datetime.obj & + $(OUTPUTDIR)\datstrm.obj & + $(OUTPUTDIR)\db.obj & + $(OUTPUTDIR)\dbgrid.obj & + $(OUTPUTDIR)\dbtable.obj & + $(OUTPUTDIR)\dcbase.obj & + $(OUTPUTDIR)\dircmn.obj & + $(OUTPUTDIR)\dlgcmn.obj & + $(OUTPUTDIR)\dndcmn.obj & + $(OUTPUTDIR)\dobjcmn.obj & + $(OUTPUTDIR)\docmdi.obj & + $(OUTPUTDIR)\docview.obj & + $(OUTPUTDIR)\dseldlg.obj & + $(OUTPUTDIR)\dynarray.obj & + $(OUTPUTDIR)\dynlib.obj & + $(OUTPUTDIR)\dynload.obj & + $(OUTPUTDIR)\effects.obj & + $(OUTPUTDIR)\encconv.obj & + $(OUTPUTDIR)\event.obj & + $(OUTPUTDIR)\extended.obj & + $(OUTPUTDIR)\fddlgcmn.obj & + $(OUTPUTDIR)\ffile.obj & + $(OUTPUTDIR)\file.obj & + $(OUTPUTDIR)\fileconf.obj & + $(OUTPUTDIR)\filefn.obj & + $(OUTPUTDIR)\filename.obj & + $(OUTPUTDIR)\filesys.obj & + $(OUTPUTDIR)\fontcmn.obj & + $(OUTPUTDIR)\fontmap.obj & + $(OUTPUTDIR)\framecmn.obj & + $(OUTPUTDIR)\fs_inet.obj & + $(OUTPUTDIR)\fs_mem.obj & + $(OUTPUTDIR)\fs_zip.obj & + $(OUTPUTDIR)\ftp.obj & + $(OUTPUTDIR)\gaugecmn.obj & + $(OUTPUTDIR)\gdicmn.obj & + $(OUTPUTDIR)\geometry.obj & + $(OUTPUTDIR)\gifdecod.obj & + $(OUTPUTDIR)\hash.obj & + $(OUTPUTDIR)\hashmap.obj & + $(OUTPUTDIR)\helpbase.obj & + $(OUTPUTDIR)\http.obj & + $(OUTPUTDIR)\iconbndl.obj & + $(OUTPUTDIR)\imagall.obj & + $(OUTPUTDIR)\imagbmp.obj & + $(OUTPUTDIR)\image.obj & + $(OUTPUTDIR)\imagfill.obj & + $(OUTPUTDIR)\imaggif.obj & + $(OUTPUTDIR)\imagiff.obj & + $(OUTPUTDIR)\imagjpeg.obj & + $(OUTPUTDIR)\imagpcx.obj & + $(OUTPUTDIR)\imagpng.obj & + $(OUTPUTDIR)\imagpnm.obj & + $(OUTPUTDIR)\imagtiff.obj & + $(OUTPUTDIR)\imagxpm.obj & + $(OUTPUTDIR)\intl.obj & + $(OUTPUTDIR)\ipcbase.obj & + $(OUTPUTDIR)\layout.obj & + $(OUTPUTDIR)\lboxcmn.obj & + $(OUTPUTDIR)\list.obj & + $(OUTPUTDIR)\log.obj & + $(OUTPUTDIR)\longlong.obj & + $(OUTPUTDIR)\matrix.obj & + $(OUTPUTDIR)\memory.obj & + $(OUTPUTDIR)\menucmn.obj & + $(OUTPUTDIR)\mimecmn.obj & + $(OUTPUTDIR)\module.obj & + $(OUTPUTDIR)\msgout.obj & + $(OUTPUTDIR)\mstream.obj & + $(OUTPUTDIR)\nbkbase.obj & + $(OUTPUTDIR)\object.obj & + $(OUTPUTDIR)\odbc.obj & + $(OUTPUTDIR)\paper.obj & + $(OUTPUTDIR)\popupcmn.obj & + $(OUTPUTDIR)\prntbase.obj & + $(OUTPUTDIR)\process.obj & + $(OUTPUTDIR)\protocol.obj & + $(OUTPUTDIR)\quantize.obj & + $(OUTPUTDIR)\radiocmn.obj & + $(OUTPUTDIR)\regex.obj & + $(OUTPUTDIR)\resource.obj & + $(OUTPUTDIR)\sckaddr.obj & + $(OUTPUTDIR)\sckfile.obj & + $(OUTPUTDIR)\sckipc.obj & + $(OUTPUTDIR)\sckstrm.obj & + $(OUTPUTDIR)\settcmn.obj & + $(OUTPUTDIR)\sizer.obj & + $(OUTPUTDIR)\socket.obj & + $(OUTPUTDIR)\statbar.obj & + $(OUTPUTDIR)\strconv.obj & + $(OUTPUTDIR)\stream.obj & + $(OUTPUTDIR)\string.obj & + $(OUTPUTDIR)\sysopt.obj & + $(OUTPUTDIR)\tbarbase.obj & + $(OUTPUTDIR)\textbuf.obj & + $(OUTPUTDIR)\textcmn.obj & + $(OUTPUTDIR)\textfile.obj & + $(OUTPUTDIR)\timercmn.obj & + $(OUTPUTDIR)\tokenzr.obj & + $(OUTPUTDIR)\toplvcmn.obj & + $(OUTPUTDIR)\treebase.obj & + $(OUTPUTDIR)\txtstrm.obj & + $(OUTPUTDIR)\unzip.obj & + $(OUTPUTDIR)\url.obj & + $(OUTPUTDIR)\utilscmn.obj & + $(OUTPUTDIR)\valgen.obj & + $(OUTPUTDIR)\validate.obj & + $(OUTPUTDIR)\valtext.obj & + $(OUTPUTDIR)\variant.obj & + $(OUTPUTDIR)\wfstream.obj & + $(OUTPUTDIR)\wincmn.obj & + $(OUTPUTDIR)\wxchar.obj & + $(OUTPUTDIR)\wxexpr.obj & + $(OUTPUTDIR)\xpmdecod.obj & + $(OUTPUTDIR)\zipstrm.obj & + $(OUTPUTDIR)\zstream.obj -MSWOBJS = accel.obj & - app.obj & - automtn.obj & - bitmap.obj & - bmpbuttn.obj & - brush.obj & - button.obj & - caret.obj & - checkbox.obj & - checklst.obj & - choice.obj & - clipbrd.obj & - colordlg.obj & - colour.obj & - combobox.obj & - control.obj & - curico.obj & - cursor.obj & - data.obj & - dataobj.obj & - dc.obj & - dcclient.obj & - dcmemory.obj & - dcprint.obj & - dcscreen.obj & - dde.obj & - dialog.obj & - dialup.obj & - dib.obj & - dibutils.obj & - dir.obj & - dirdlg.obj & - dragimag.obj & - dropsrc.obj & - droptgt.obj & - enhmeta.obj & - evtloop.obj & - fdrepdlg.obj & - filedlg.obj & - font.obj & - fontdlg.obj & - fontenum.obj & - fontutil.obj & - frame.obj & - gauge95.obj & - gaugemsw.obj & - gdiimage.obj & - gdiobj.obj & - glcanvas.obj & - gsocket.obj & - gsockmsw.obj & - helpbest.obj & - helpchm.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 & - mimetype.obj & - minifram.obj & - msgdlg.obj & - mslu.obj & - nativdlg.obj & - notebook.obj & - oleutils.obj & - ownerdrw.obj & - palette.obj & - pen.obj & - penwin.obj & - popupwin.obj & - printdlg.obj & - printwin.obj & - radiobox.obj & - radiobut.obj & - regconf.obj & - region.obj & - registry.obj & - scrolbar.obj & - settings.obj & - slider95.obj & - slidrmsw.obj & - snglinst.obj & - spinbutt.obj & - spinctrl.obj & - statbmp.obj & - statbox.obj & - statbr95.obj & - statline.obj & - stattext.obj & - tabctrl.obj & - taskbar.obj & - tbar95.obj & - tbarmsw.obj & - textctrl.obj & - tglbtn.obj & - thread.obj & - timer.obj & - tooltip.obj & - toplevel.obj & - treectrl.obj & - utils.obj & - utilsexc.obj & - uuid.obj & - volume.obj & - wave.obj & - window.obj +MSWOBJS = $(OUTPUTDIR)\accel.obj & + $(OUTPUTDIR)\app.obj & + $(OUTPUTDIR)\automtn.obj & + $(OUTPUTDIR)\bitmap.obj & + $(OUTPUTDIR)\bmpbuttn.obj & + $(OUTPUTDIR)\brush.obj & + $(OUTPUTDIR)\button.obj & + $(OUTPUTDIR)\caret.obj & + $(OUTPUTDIR)\checkbox.obj & + $(OUTPUTDIR)\checklst.obj & + $(OUTPUTDIR)\choice.obj & + $(OUTPUTDIR)\clipbrd.obj & + $(OUTPUTDIR)\colordlg.obj & + $(OUTPUTDIR)\colour.obj & + $(OUTPUTDIR)\combobox.obj & + $(OUTPUTDIR)\control.obj & + $(OUTPUTDIR)\curico.obj & + $(OUTPUTDIR)\cursor.obj & + $(OUTPUTDIR)\data.obj & + $(OUTPUTDIR)\dataobj.obj & + $(OUTPUTDIR)\dc.obj & + $(OUTPUTDIR)\dcclient.obj & + $(OUTPUTDIR)\dcmemory.obj & + $(OUTPUTDIR)\dcprint.obj & + $(OUTPUTDIR)\dcscreen.obj & + $(OUTPUTDIR)\dde.obj & + $(OUTPUTDIR)\dialog.obj & + $(OUTPUTDIR)\dialup.obj & + $(OUTPUTDIR)\dib.obj & + $(OUTPUTDIR)\dibutils.obj & + $(OUTPUTDIR)\dir.obj & + $(OUTPUTDIR)\dirdlg.obj & + $(OUTPUTDIR)\dragimag.obj & + $(OUTPUTDIR)\dropsrc.obj & + $(OUTPUTDIR)\droptgt.obj & + $(OUTPUTDIR)\enhmeta.obj & + $(OUTPUTDIR)\evtloop.obj & + $(OUTPUTDIR)\fdrepdlg.obj & + $(OUTPUTDIR)\filedlg.obj & + $(OUTPUTDIR)\font.obj & + $(OUTPUTDIR)\fontdlg.obj & + $(OUTPUTDIR)\fontenum.obj & + $(OUTPUTDIR)\fontutil.obj & + $(OUTPUTDIR)\frame.obj & + $(OUTPUTDIR)\gauge95.obj & + $(OUTPUTDIR)\gdiimage.obj & + $(OUTPUTDIR)\gdiobj.obj & + $(OUTPUTDIR)\glcanvas.obj & + $(OUTPUTDIR)\gsocket.obj & + $(OUTPUTDIR)\gsockmsw.obj & + $(OUTPUTDIR)\helpbest.obj & + $(OUTPUTDIR)\helpchm.obj & + $(OUTPUTDIR)\helpwin.obj & + $(OUTPUTDIR)\icon.obj & + $(OUTPUTDIR)\imaglist.obj & + $(OUTPUTDIR)\iniconf.obj & + $(OUTPUTDIR)\joystick.obj & + $(OUTPUTDIR)\listbox.obj & + $(OUTPUTDIR)\listctrl.obj & + $(OUTPUTDIR)\main.obj & + $(OUTPUTDIR)\mdi.obj & + $(OUTPUTDIR)\menu.obj & + $(OUTPUTDIR)\menuitem.obj & + $(OUTPUTDIR)\metafile.obj & + $(OUTPUTDIR)\mimetype.obj & + $(OUTPUTDIR)\minifram.obj & + $(OUTPUTDIR)\msgdlg.obj & + $(OUTPUTDIR)\mslu.obj & + $(OUTPUTDIR)\nativdlg.obj & + $(OUTPUTDIR)\notebook.obj & + $(OUTPUTDIR)\oleutils.obj & + $(OUTPUTDIR)\ownerdrw.obj & + $(OUTPUTDIR)\palette.obj & + $(OUTPUTDIR)\pen.obj & + $(OUTPUTDIR)\penwin.obj & + $(OUTPUTDIR)\popupwin.obj & + $(OUTPUTDIR)\printdlg.obj & + $(OUTPUTDIR)\printwin.obj & + $(OUTPUTDIR)\radiobox.obj & + $(OUTPUTDIR)\radiobut.obj & + $(OUTPUTDIR)\regconf.obj & + $(OUTPUTDIR)\region.obj & + $(OUTPUTDIR)\registry.obj & + $(OUTPUTDIR)\scrolbar.obj & + $(OUTPUTDIR)\settings.obj & + $(OUTPUTDIR)\slider95.obj & + $(OUTPUTDIR)\snglinst.obj & + $(OUTPUTDIR)\spinbutt.obj & + $(OUTPUTDIR)\spinctrl.obj & + $(OUTPUTDIR)\statbmp.obj & + $(OUTPUTDIR)\statbox.obj & + $(OUTPUTDIR)\statbr95.obj & + $(OUTPUTDIR)\statline.obj & + $(OUTPUTDIR)\stattext.obj & + $(OUTPUTDIR)\tabctrl.obj & + $(OUTPUTDIR)\taskbar.obj & + $(OUTPUTDIR)\tbar95.obj & + $(OUTPUTDIR)\textctrl.obj & + $(OUTPUTDIR)\tglbtn.obj & + $(OUTPUTDIR)\thread.obj & + $(OUTPUTDIR)\timer.obj & + $(OUTPUTDIR)\tooltip.obj & + $(OUTPUTDIR)\toplevel.obj & + $(OUTPUTDIR)\treectrl.obj & + $(OUTPUTDIR)\utils.obj & + $(OUTPUTDIR)\utilsexc.obj & + $(OUTPUTDIR)\uuid.obj & + $(OUTPUTDIR)\volume.obj & + $(OUTPUTDIR)\wave.obj & + $(OUTPUTDIR)\window.obj -HTMLOBJS = helpctrl.obj & - helpdata.obj & - helpfrm.obj & - htmlcell.obj & - htmlfilt.obj & - htmlpars.obj & - htmltag.obj & - htmlwin.obj & - htmprint.obj & - m_dflist.obj & - m_fonts.obj & - m_hline.obj & - m_image.obj & - m_layout.obj & - m_links.obj & - m_list.obj & - m_pre.obj & - m_style.obj & - m_tables.obj & - winpars.obj +HTMLOBJS = $(OUTPUTDIR)\helpctrl.obj & + $(OUTPUTDIR)\helpdata.obj & + $(OUTPUTDIR)\helpfrm.obj & + $(OUTPUTDIR)\htmlcell.obj & + $(OUTPUTDIR)\htmlfilt.obj & + $(OUTPUTDIR)\htmlpars.obj & + $(OUTPUTDIR)\htmltag.obj & + $(OUTPUTDIR)\htmlwin.obj & + $(OUTPUTDIR)\htmprint.obj & + $(OUTPUTDIR)\m_dflist.obj & + $(OUTPUTDIR)\m_fonts.obj & + $(OUTPUTDIR)\m_hline.obj & + $(OUTPUTDIR)\m_image.obj & + $(OUTPUTDIR)\m_layout.obj & + $(OUTPUTDIR)\m_links.obj & + $(OUTPUTDIR)\m_list.obj & + $(OUTPUTDIR)\m_pre.obj & + $(OUTPUTDIR)\m_style.obj & + $(OUTPUTDIR)\m_tables.obj & + $(OUTPUTDIR)\winpars.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -ARCHINCDIR=$(WXDIR)\lib\msw SETUP_H=$(ARCHINCDIR)\wx\setup.h -all: $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC +all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC $(ARCHINCDIR)\wx: - mkdir $(ARCHINCDIR) - mkdir $(ARCHINCDIR)\wx + mkdir $(ARCHINCDIR) + mkdir $(ARCHINCDIR)\wx + +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx - copy $(WXDIR)\include\wx\msw\setup.h $@ + copy $(WXDIR)\include\wx\msw\setup.h $@ +LBCFILE=wx$(TOOLKIT).lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc - -#test : $(OBJECTS) -# %create tmp.lbc -# @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i -# wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE) clean: .SYMBOLIC $(EXTRATARGETSCLEAN) @@ -399,746 +378,735 @@ clean: .SYMBOLIC $(EXTRATARGETSCLEAN) cleanall: clean -accel.obj: $(MSWDIR)\accel.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\accel.obj: $(MSWDIR)\accel.cpp + *$(CXX) $(CXXFLAGS) $< -app.obj: $(MSWDIR)\app.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\app.obj: $(MSWDIR)\app.cpp + *$(CXX) $(CXXFLAGS) $< -automtn.obj: $(OLEDIR)\automtn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\automtn.obj: $(OLEDIR)\automtn.cpp + *$(CXX) $(CXXFLAGS) $< -bitmap.obj: $(MSWDIR)\bitmap.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\bitmap.obj: $(MSWDIR)\bitmap.cpp + *$(CXX) $(CXXFLAGS) $< -bmpbuttn.obj: $(MSWDIR)\bmpbuttn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.cpp + *$(CXX) $(CXXFLAGS) $< -brush.obj: $(MSWDIR)\brush.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\brush.obj: $(MSWDIR)\brush.cpp + *$(CXX) $(CXXFLAGS) $< -button.obj: $(MSWDIR)\button.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\button.obj: $(MSWDIR)\button.cpp + *$(CXX) $(CXXFLAGS) $< -caret.obj: $(MSWDIR)\caret.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\caret.obj: $(MSWDIR)\caret.cpp + *$(CXX) $(CXXFLAGS) $< -checkbox.obj: $(MSWDIR)\checkbox.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\checkbox.obj: $(MSWDIR)\checkbox.cpp + *$(CXX) $(CXXFLAGS) $< -checklst.obj: $(MSWDIR)\checklst.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\checklst.obj: $(MSWDIR)\checklst.cpp + *$(CXX) $(CXXFLAGS) $< -choice.obj: $(MSWDIR)\choice.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\choice.obj: $(MSWDIR)\choice.cpp + *$(CXX) $(CXXFLAGS) $< -clipbrd.obj: $(MSWDIR)\clipbrd.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.cpp + *$(CXX) $(CXXFLAGS) $< -colordlg.obj: $(MSWDIR)\colordlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\colordlg.obj: $(MSWDIR)\colordlg.cpp + *$(CXX) $(CXXFLAGS) $< -colour.obj: $(MSWDIR)\colour.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\colour.obj: $(MSWDIR)\colour.cpp + *$(CXX) $(CXXFLAGS) $< -combobox.obj: $(MSWDIR)\combobox.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\combobox.obj: $(MSWDIR)\combobox.cpp + *$(CXX) $(CXXFLAGS) $< -control.obj: $(MSWDIR)\control.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\control.obj: $(MSWDIR)\control.cpp + *$(CXX) $(CXXFLAGS) $< -curico.obj: $(MSWDIR)\curico.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\curico.obj: $(MSWDIR)\curico.cpp + *$(CXX) $(CXXFLAGS) $< -cursor.obj: $(MSWDIR)\cursor.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\cursor.obj: $(MSWDIR)\cursor.cpp + *$(CXX) $(CXXFLAGS) $< -data.obj: $(MSWDIR)\data.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\data.obj: $(MSWDIR)\data.cpp + *$(CXX) $(CXXFLAGS) $< -dataobj.obj: $(OLEDIR)\dataobj.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dataobj.obj: $(OLEDIR)\dataobj.cpp + *$(CXX) $(CXXFLAGS) $< -dc.obj: $(MSWDIR)\dc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dc.obj: $(MSWDIR)\dc.cpp + *$(CXX) $(CXXFLAGS) $< -dcclient.obj: $(MSWDIR)\dcclient.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcclient.obj: $(MSWDIR)\dcclient.cpp + *$(CXX) $(CXXFLAGS) $< -dcmemory.obj: $(MSWDIR)\dcmemory.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.cpp + *$(CXX) $(CXXFLAGS) $< -dcprint.obj: $(MSWDIR)\dcprint.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcprint.obj: $(MSWDIR)\dcprint.cpp + *$(CXX) $(CXXFLAGS) $< -dcscreen.obj: $(MSWDIR)\dcscreen.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.cpp + *$(CXX) $(CXXFLAGS) $< -dde.obj: $(MSWDIR)\dde.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dde.obj: $(MSWDIR)\dde.cpp + *$(CXX) $(CXXFLAGS) $< -dialog.obj: $(MSWDIR)\dialog.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dialog.obj: $(MSWDIR)\dialog.cpp + *$(CXX) $(CXXFLAGS) $< -dialup.obj: $(MSWDIR)\dialup.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dialup.obj: $(MSWDIR)\dialup.cpp + *$(CXX) $(CXXFLAGS) $< -dib.obj: $(MSWDIR)\dib.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dib.obj: $(MSWDIR)\dib.cpp + *$(CXX) $(CXXFLAGS) $< -dibutils.obj: $(MSWDIR)\dibutils.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dibutils.obj: $(MSWDIR)\dibutils.cpp + *$(CXX) $(CXXFLAGS) $< -dir.obj: $(MSWDIR)\dir.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dir.obj: $(MSWDIR)\dir.cpp + *$(CXX) $(CXXFLAGS) $< -dirdlg.obj: $(MSWDIR)\dirdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.cpp + *$(CXX) $(CXXFLAGS) $< -dragimag.obj: $(MSWDIR)\dragimag.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dragimag.obj: $(MSWDIR)\dragimag.cpp + *$(CXX) $(CXXFLAGS) $< -dropsrc.obj: $(OLEDIR)\dropsrc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.cpp + *$(CXX) $(CXXFLAGS) $< -droptgt.obj: $(OLEDIR)\droptgt.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\droptgt.obj: $(OLEDIR)\droptgt.cpp + *$(CXX) $(CXXFLAGS) $< -enhmeta.obj: $(MSWDIR)\enhmeta.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.cpp + *$(CXX) $(CXXFLAGS) $< -evtloop.obj: $(MSWDIR)\evtloop.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\evtloop.obj: $(MSWDIR)\evtloop.cpp + *$(CXX) $(CXXFLAGS) $< -fdrepdlg.obj: $(MSWDIR)\fdrepdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.cpp + *$(CXX) $(CXXFLAGS) $< -filedlg.obj: $(MSWDIR)\filedlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\filedlg.obj: $(MSWDIR)\filedlg.cpp + *$(CXX) $(CXXFLAGS) $< -font.obj: $(MSWDIR)\font.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\font.obj: $(MSWDIR)\font.cpp + *$(CXX) $(CXXFLAGS) $< -fontdlg.obj: $(MSWDIR)\fontdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.cpp + *$(CXX) $(CXXFLAGS) $< -fontenum.obj: $(MSWDIR)\fontenum.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fontenum.obj: $(MSWDIR)\fontenum.cpp + *$(CXX) $(CXXFLAGS) $< -fontutil.obj: $(MSWDIR)\fontutil.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fontutil.obj: $(MSWDIR)\fontutil.cpp + *$(CXX) $(CXXFLAGS) $< -frame.obj: $(MSWDIR)\frame.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\frame.obj: $(MSWDIR)\frame.cpp + *$(CXX) $(CXXFLAGS) $< -gauge95.obj: $(MSWDIR)\gauge95.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gauge95.obj: $(MSWDIR)\gauge95.cpp + *$(CXX) $(CXXFLAGS) $< -gaugemsw.obj: $(MSWDIR)\gaugemsw.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.cpp + *$(CXX) $(CXXFLAGS) $< -gdiimage.obj: $(MSWDIR)\gdiimage.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.cpp + *$(CXX) $(CXXFLAGS) $< -gdiobj.obj: $(MSWDIR)\gdiobj.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.cpp + *$(CXX) $(CXXFLAGS) $< -glcanvas.obj: $(MSWDIR)\glcanvas.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gsocket.obj: $(MSWDIR)\gsocket.c + *$(CC) $(CFLAGS) $< -gsocket.obj: $(MSWDIR)\gsocket.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c + *$(CC) $(CFLAGS) $< -gsockmsw.obj: $(MSWDIR)\gsockmsw.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpbest.obj: $(MSWDIR)\helpbest.cpp + *$(CXX) $(CXXFLAGS) $< -helpbest.obj: $(MSWDIR)\helpbest.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpchm.obj: $(MSWDIR)\helpchm.cpp + *$(CXX) $(CXXFLAGS) $< -helpchm.obj: $(MSWDIR)\helpchm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpwin.obj: $(MSWDIR)\helpwin.cpp + *$(CXX) $(CXXFLAGS) $< -helpwin.obj: $(MSWDIR)\helpwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\icon.obj: $(MSWDIR)\icon.cpp + *$(CXX) $(CXXFLAGS) $< -icon.obj: $(MSWDIR)\icon.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imaglist.obj: $(MSWDIR)\imaglist.cpp + *$(CXX) $(CXXFLAGS) $< -imaglist.obj: $(MSWDIR)\imaglist.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\iniconf.obj: $(MSWDIR)\iniconf.cpp + *$(CXX) $(CXXFLAGS) $< -iniconf.obj: $(MSWDIR)\iniconf.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\joystick.obj: $(MSWDIR)\joystick.cpp + *$(CXX) $(CXXFLAGS) $< -joystick.obj: $(MSWDIR)\joystick.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\listbox.obj: $(MSWDIR)\listbox.cpp + *$(CXX) $(CXXFLAGS) $< -listbox.obj: $(MSWDIR)\listbox.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\listctrl.obj: $(MSWDIR)\listctrl.cpp + *$(CXX) $(CXXFLAGS) $< -listctrl.obj: $(MSWDIR)\listctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\main.obj: $(MSWDIR)\main.cpp + *$(CXX) $(CXXFLAGS) $< -main.obj: $(MSWDIR)\main.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\mdi.obj: $(MSWDIR)\mdi.cpp + *$(CXX) $(CXXFLAGS) $< -mdi.obj: $(MSWDIR)\mdi.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\menu.obj: $(MSWDIR)\menu.cpp + *$(CXX) $(CXXFLAGS) $< -menu.obj: $(MSWDIR)\menu.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\menuitem.obj: $(MSWDIR)\menuitem.cpp + *$(CXX) $(CXXFLAGS) $< -menuitem.obj: $(MSWDIR)\menuitem.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\metafile.obj: $(MSWDIR)\metafile.cpp + *$(CXX) $(CXXFLAGS) $< -metafile.obj: $(MSWDIR)\metafile.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\mimetype.obj: $(MSWDIR)\mimetype.cpp + *$(CXX) $(CXXFLAGS) $< -mimetype.obj: $(MSWDIR)\mimetype.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\minifram.obj: $(MSWDIR)\minifram.cpp + *$(CXX) $(CXXFLAGS) $< -minifram.obj: $(MSWDIR)\minifram.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.cpp + *$(CXX) $(CXXFLAGS) $< -msgdlg.obj: $(MSWDIR)\msgdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\mslu.obj: $(MSWDIR)\mslu.cpp + *$(CXX) $(CXXFLAGS) $< -mslu.obj: $(MSWDIR)\mslu.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.cpp + *$(CXX) $(CXXFLAGS) $< -nativdlg.obj: $(MSWDIR)\nativdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\notebook.obj: $(MSWDIR)\notebook.cpp + *$(CXX) $(CXXFLAGS) $< -notebook.obj: $(MSWDIR)\notebook.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\oleutils.obj: $(OLEDIR)\oleutils.cpp + *$(CXX) $(CXXFLAGS) $< -oleutils.obj: $(OLEDIR)\oleutils.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.cpp + *$(CXX) $(CXXFLAGS) $< -ownerdrw.obj: $(MSWDIR)\ownerdrw.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\palette.obj: $(MSWDIR)\palette.cpp + *$(CXX) $(CXXFLAGS) $< -palette.obj: $(MSWDIR)\palette.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\pen.obj: $(MSWDIR)\pen.cpp + *$(CXX) $(CXXFLAGS) $< -pen.obj: $(MSWDIR)\pen.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\penwin.obj: $(MSWDIR)\penwin.cpp + *$(CXX) $(CXXFLAGS) $< -penwin.obj: $(MSWDIR)\penwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\popupwin.obj: $(MSWDIR)\popupwin.cpp + *$(CXX) $(CXXFLAGS) $< -popupwin.obj: $(MSWDIR)\popupwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\printdlg.obj: $(MSWDIR)\printdlg.cpp + *$(CXX) $(CXXFLAGS) $< -printdlg.obj: $(MSWDIR)\printdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\printwin.obj: $(MSWDIR)\printwin.cpp + *$(CXX) $(CXXFLAGS) $< -printwin.obj: $(MSWDIR)\printwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\radiobox.obj: $(MSWDIR)\radiobox.cpp + *$(CXX) $(CXXFLAGS) $< -radiobox.obj: $(MSWDIR)\radiobox.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\radiobut.obj: $(MSWDIR)\radiobut.cpp + *$(CXX) $(CXXFLAGS) $< -radiobut.obj: $(MSWDIR)\radiobut.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\regconf.obj: $(MSWDIR)\regconf.cpp + *$(CXX) $(CXXFLAGS) $< -regconf.obj: $(MSWDIR)\regconf.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\region.obj: $(MSWDIR)\region.cpp + *$(CXX) $(CXXFLAGS) $< -region.obj: $(MSWDIR)\region.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\registry.obj: $(MSWDIR)\registry.cpp + *$(CXX) $(CXXFLAGS) $< -registry.obj: $(MSWDIR)\registry.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.cpp + *$(CXX) $(CXXFLAGS) $< -scrolbar.obj: $(MSWDIR)\scrolbar.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\settings.obj: $(MSWDIR)\settings.cpp + *$(CXX) $(CXXFLAGS) $< -settings.obj: $(MSWDIR)\settings.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\slider95.obj: $(MSWDIR)\slider95.cpp + *$(CXX) $(CXXFLAGS) $< -slider95.obj: $(MSWDIR)\slider95.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\snglinst.obj: $(MSWDIR)\snglinst.cpp + *$(CXX) $(CXXFLAGS) $< -slidrmsw.obj: $(MSWDIR)\slidrmsw.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.cpp + *$(CXX) $(CXXFLAGS) $< -snglinst.obj: $(MSWDIR)\snglinst.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.cpp + *$(CXX) $(CXXFLAGS) $< -spinbutt.obj: $(MSWDIR)\spinbutt.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\statbmp.obj: $(MSWDIR)\statbmp.cpp + *$(CXX) $(CXXFLAGS) $< -spinctrl.obj: $(MSWDIR)\spinctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\statbox.obj: $(MSWDIR)\statbox.cpp + *$(CXX) $(CXXFLAGS) $< -statbmp.obj: $(MSWDIR)\statbmp.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\statbr95.obj: $(MSWDIR)\statbr95.cpp + *$(CXX) $(CXXFLAGS) $< -statbox.obj: $(MSWDIR)\statbox.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\statline.obj: $(MSWDIR)\statline.cpp + *$(CXX) $(CXXFLAGS) $< -statbr95.obj: $(MSWDIR)\statbr95.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\stattext.obj: $(MSWDIR)\stattext.cpp + *$(CXX) $(CXXFLAGS) $< -statline.obj: $(MSWDIR)\statline.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tabctrl.obj: $(MSWDIR)\tabctrl.cpp + *$(CXX) $(CXXFLAGS) $< -stattext.obj: $(MSWDIR)\stattext.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\taskbar.obj: $(MSWDIR)\taskbar.cpp + *$(CXX) $(CXXFLAGS) $< -tabctrl.obj: $(MSWDIR)\tabctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tbar95.obj: $(MSWDIR)\tbar95.cpp + *$(CXX) $(CXXFLAGS) $< -taskbar.obj: $(MSWDIR)\taskbar.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\textctrl.obj: $(MSWDIR)\textctrl.cpp + *$(CXX) $(CXXFLAGS) $< -tbar95.obj: $(MSWDIR)\tbar95.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.cpp + *$(CXX) $(CXXFLAGS) $< -tbarmsw.obj: $(MSWDIR)\tbarmsw.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\thread.obj: $(MSWDIR)\thread.cpp + *$(CXX) $(CXXFLAGS) $< -textctrl.obj: $(MSWDIR)\textctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\timer.obj: $(MSWDIR)\timer.cpp + *$(CXX) $(CXXFLAGS) $< -tglbtn.obj: $(MSWDIR)\tglbtn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tooltip.obj: $(MSWDIR)\tooltip.cpp + *$(CXX) $(CXXFLAGS) $< -thread.obj: $(MSWDIR)\thread.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\toplevel.obj: $(MSWDIR)\toplevel.cpp + *$(CXX) $(CXXFLAGS) $< -timer.obj: $(MSWDIR)\timer.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\treectrl.obj: $(MSWDIR)\treectrl.cpp + *$(CXX) $(CXXFLAGS) $< -tooltip.obj: $(MSWDIR)\tooltip.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\utils.obj: $(MSWDIR)\utils.cpp + *$(CXX) $(CXXFLAGS) $< -toplevel.obj: $(MSWDIR)\toplevel.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.cpp + *$(CXX) $(CXXFLAGS) $< -treectrl.obj: $(MSWDIR)\treectrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\uuid.obj: $(OLEDIR)\uuid.cpp + *$(CXX) $(CXXFLAGS) $< -utils.obj: $(MSWDIR)\utils.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\volume.obj: $(MSWDIR)\volume.cpp + *$(CXX) $(CXXFLAGS) $< -utilsexc.obj: $(MSWDIR)\utilsexc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\wave.obj: $(MSWDIR)\wave.cpp + *$(CXX) $(CXXFLAGS) $< -uuid.obj: $(OLEDIR)\uuid.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - -volume.obj: $(MSWDIR)\volume.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - -wave.obj: $(MSWDIR)\wave.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - -window.obj: $(MSWDIR)\window.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\window.obj: $(MSWDIR)\window.cpp + *$(CXX) $(CXXFLAGS) $< ######################################################## # Common objects (always compiled) -appcmn.obj: $(COMMDIR)\appcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\appcmn.obj: $(COMMDIR)\appcmn.cpp + *$(CXX) $(CXXFLAGS) $< -artprov.obj: $(COMMDIR)\artprov.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\artprov.obj: $(COMMDIR)\artprov.cpp + *$(CXX) $(CXXFLAGS) $< -artstd.obj: $(COMMDIR)\artstd.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\artstd.obj: $(COMMDIR)\artstd.cpp + *$(CXX) $(CXXFLAGS) $< -choiccmn.obj: $(COMMDIR)\choiccmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.cpp + *$(CXX) $(CXXFLAGS) $< -clipcmn.obj: $(COMMDIR)\clipcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.cpp + *$(CXX) $(CXXFLAGS) $< -clntdata.obj: $(COMMDIR)\clntdata.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\clntdata.obj: $(COMMDIR)\clntdata.cpp + *$(CXX) $(CXXFLAGS) $< -cmdline.obj: $(COMMDIR)\cmdline.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\cmdline.obj: $(COMMDIR)\cmdline.cpp + *$(CXX) $(CXXFLAGS) $< -cmdproc.obj: $(COMMDIR)\cmdproc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.cpp + *$(CXX) $(CXXFLAGS) $< -cmndata.obj: $(COMMDIR)\cmndata.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\cmndata.obj: $(COMMDIR)\cmndata.cpp + *$(CXX) $(CXXFLAGS) $< -config.obj: $(COMMDIR)\config.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\config.obj: $(COMMDIR)\config.cpp + *$(CXX) $(CXXFLAGS) $< -containr.obj: $(COMMDIR)\containr.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\containr.obj: $(COMMDIR)\containr.cpp + *$(CXX) $(CXXFLAGS) $< -cshelp.obj: $(COMMDIR)\cshelp.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\cshelp.obj: $(COMMDIR)\cshelp.cpp + *$(CXX) $(CXXFLAGS) $< -ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp + *$(CXX) $(CXXFLAGS) $< -ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp + *$(CXX) $(CXXFLAGS) $< -datetime.obj: $(COMMDIR)\datetime.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\datetime.obj: $(COMMDIR)\datetime.cpp + *$(CXX) $(CXXFLAGS) $< -datstrm.obj: $(COMMDIR)\datstrm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\datstrm.obj: $(COMMDIR)\datstrm.cpp + *$(CXX) $(CXXFLAGS) $< -db.obj: $(COMMDIR)\db.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\db.obj: $(COMMDIR)\db.cpp + *$(CXX) $(CXXFLAGS) $< -dbgrid.obj: $(COMMDIR)\dbgrid.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dbgrid.obj: $(COMMDIR)\dbgrid.cpp + *$(CXX) $(CXXFLAGS) $< -dbtable.obj: $(COMMDIR)\dbtable.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dbtable.obj: $(COMMDIR)\dbtable.cpp + *$(CXX) $(CXXFLAGS) $< -dcbase.obj: $(COMMDIR)\dcbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcbase.obj: $(COMMDIR)\dcbase.cpp + *$(CXX) $(CXXFLAGS) $< -dircmn.obj: $(COMMDIR)\dircmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dircmn.obj: $(COMMDIR)\dircmn.cpp + *$(CXX) $(CXXFLAGS) $< -dlgcmn.obj: $(COMMDIR)\dlgcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.cpp + *$(CXX) $(CXXFLAGS) $< -dndcmn.obj: $(COMMDIR)\dndcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.cpp + *$(CXX) $(CXXFLAGS) $< -dobjcmn.obj: $(COMMDIR)\dobjcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.cpp + *$(CXX) $(CXXFLAGS) $< -docmdi.obj: $(COMMDIR)\docmdi.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\docmdi.obj: $(COMMDIR)\docmdi.cpp + *$(CXX) $(CXXFLAGS) $< -docview.obj: $(COMMDIR)\docview.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\docview.obj: $(COMMDIR)\docview.cpp + *$(CXX) $(CXXFLAGS) $< -dseldlg.obj: $(COMMDIR)\dseldlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.cpp + *$(CXX) $(CXXFLAGS) $< -dynarray.obj: $(COMMDIR)\dynarray.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dynarray.obj: $(COMMDIR)\dynarray.cpp + *$(CXX) $(CXXFLAGS) $< -dynlib.obj: $(COMMDIR)\dynlib.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dynlib.obj: $(COMMDIR)\dynlib.cpp + *$(CXX) $(CXXFLAGS) $< -dynload.obj: $(COMMDIR)\dynload.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dynload.obj: $(COMMDIR)\dynload.cpp + *$(CXX) $(CXXFLAGS) $< -effects.obj: $(COMMDIR)\effects.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\effects.obj: $(COMMDIR)\effects.cpp + *$(CXX) $(CXXFLAGS) $< -encconv.obj: $(COMMDIR)\encconv.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\encconv.obj: $(COMMDIR)\encconv.cpp + *$(CXX) $(CXXFLAGS) $< -event.obj: $(COMMDIR)\event.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\event.obj: $(COMMDIR)\event.cpp + *$(CXX) $(CXXFLAGS) $< -extended.obj: $(COMMDIR)\extended.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\extended.obj: $(COMMDIR)\extended.c + *$(CC) $(CFLAGS) $< -fddlgcmn.obj: $(COMMDIR)\fddlgcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.cpp + *$(CXX) $(CXXFLAGS) $< -ffile.obj: $(COMMDIR)\ffile.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\ffile.obj: $(COMMDIR)\ffile.cpp + *$(CXX) $(CXXFLAGS) $< -file.obj: $(COMMDIR)\file.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\file.obj: $(COMMDIR)\file.cpp + *$(CXX) $(CXXFLAGS) $< -fileconf.obj: $(COMMDIR)\fileconf.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fileconf.obj: $(COMMDIR)\fileconf.cpp + *$(CXX) $(CXXFLAGS) $< -filefn.obj: $(COMMDIR)\filefn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\filefn.obj: $(COMMDIR)\filefn.cpp + *$(CXX) $(CXXFLAGS) $< -filename.obj: $(COMMDIR)\filename.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\filename.obj: $(COMMDIR)\filename.cpp + *$(CXX) $(CXXFLAGS) $< -filesys.obj: $(COMMDIR)\filesys.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\filesys.obj: $(COMMDIR)\filesys.cpp + *$(CXX) $(CXXFLAGS) $< -fontcmn.obj: $(COMMDIR)\fontcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.cpp + *$(CXX) $(CXXFLAGS) $< -fontmap.obj: $(COMMDIR)\fontmap.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fontmap.obj: $(COMMDIR)\fontmap.cpp + *$(CXX) $(CXXFLAGS) $< -framecmn.obj: $(COMMDIR)\framecmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\framecmn.obj: $(COMMDIR)\framecmn.cpp + *$(CXX) $(CXXFLAGS) $< -fs_inet.obj: $(COMMDIR)\fs_inet.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.cpp + *$(CXX) $(CXXFLAGS) $< -fs_mem.obj: $(COMMDIR)\fs_mem.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.cpp + *$(CXX) $(CXXFLAGS) $< -fs_zip.obj: $(COMMDIR)\fs_zip.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.cpp + *$(CXX) $(CXXFLAGS) $< -ftp.obj: $(COMMDIR)\ftp.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\ftp.obj: $(COMMDIR)\ftp.cpp + *$(CXX) $(CXXFLAGS) $< -gaugecmn.obj: $(COMMDIR)\gaugecmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.cpp + *$(CXX) $(CXXFLAGS) $< -gdicmn.obj: $(COMMDIR)\gdicmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.cpp + *$(CXX) $(CXXFLAGS) $< -geometry.obj: $(COMMDIR)\geometry.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\geometry.obj: $(COMMDIR)\geometry.cpp + *$(CXX) $(CXXFLAGS) $< -gifdecod.obj: $(COMMDIR)\gifdecod.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.cpp + *$(CXX) $(CXXFLAGS) $< -hash.obj: $(COMMDIR)\hash.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\hash.obj: $(COMMDIR)\hash.cpp + *$(CXX) $(CXXFLAGS) $< -hashmap.obj: $(COMMDIR)\hashmap.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\hashmap.obj: $(COMMDIR)\hashmap.cpp + *$(CXX) $(CXXFLAGS) $< -helpbase.obj: $(COMMDIR)\helpbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpbase.obj: $(COMMDIR)\helpbase.cpp + *$(CXX) $(CXXFLAGS) $< -http.obj: $(COMMDIR)\http.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\http.obj: $(COMMDIR)\http.cpp + *$(CXX) $(CXXFLAGS) $< -iconbndl.obj: $(COMMDIR)\iconbndl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\iconbndl.obj: $(COMMDIR)\iconbndl.cpp + *$(CXX) $(CXXFLAGS) $< -imagall.obj: $(COMMDIR)\imagall.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagall.obj: $(COMMDIR)\imagall.cpp + *$(CXX) $(CXXFLAGS) $< -imagbmp.obj: $(COMMDIR)\imagbmp.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.cpp + *$(CXX) $(CXXFLAGS) $< -image.obj: $(COMMDIR)\image.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\image.obj: $(COMMDIR)\image.cpp + *$(CXX) $(CXXFLAGS) $< -imagfill.obj: $(COMMDIR)\imagfill.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagfill.obj: $(COMMDIR)\imagfill.cpp + *$(CXX) $(CXXFLAGS) $< -imaggif.obj: $(COMMDIR)\imaggif.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imaggif.obj: $(COMMDIR)\imaggif.cpp + *$(CXX) $(CXXFLAGS) $< -imagiff.obj: $(COMMDIR)\imagiff.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagiff.obj: $(COMMDIR)\imagiff.cpp + *$(CXX) $(CXXFLAGS) $< -imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp + *$(CXX) $(CXXFLAGS) $< -imagpcx.obj: $(COMMDIR)\imagpcx.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.cpp + *$(CXX) $(CXXFLAGS) $< -imagpng.obj: $(COMMDIR)\imagpng.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagpng.obj: $(COMMDIR)\imagpng.cpp + *$(CXX) $(CXXFLAGS) $< -imagpnm.obj: $(COMMDIR)\imagpnm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.cpp + *$(CXX) $(CXXFLAGS) $< -imagtiff.obj: $(COMMDIR)\imagtiff.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.cpp + *$(CXX) $(CXXFLAGS) $< -imagxpm.obj: $(COMMDIR)\imagxpm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.cpp + *$(CXX) $(CXXFLAGS) $< -intl.obj: $(COMMDIR)\intl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\intl.obj: $(COMMDIR)\intl.cpp + *$(CXX) $(CXXFLAGS) $< -ipcbase.obj: $(COMMDIR)\ipcbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.cpp + *$(CXX) $(CXXFLAGS) $< -layout.obj: $(COMMDIR)\layout.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\layout.obj: $(COMMDIR)\layout.cpp + *$(CXX) $(CXXFLAGS) $< -lboxcmn.obj: $(COMMDIR)\lboxcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\lboxcmn.obj: $(COMMDIR)\lboxcmn.cpp + *$(CXX) $(CXXFLAGS) $< -list.obj: $(COMMDIR)\list.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\list.obj: $(COMMDIR)\list.cpp + *$(CXX) $(CXXFLAGS) $< -log.obj: $(COMMDIR)\log.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\log.obj: $(COMMDIR)\log.cpp + *$(CXX) $(CXXFLAGS) $< -longlong.obj: $(COMMDIR)\longlong.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\longlong.obj: $(COMMDIR)\longlong.cpp + *$(CXX) $(CXXFLAGS) $< -matrix.obj: $(COMMDIR)\matrix.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\matrix.obj: $(COMMDIR)\matrix.cpp + *$(CXX) $(CXXFLAGS) $< -memory.obj: $(COMMDIR)\memory.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\memory.obj: $(COMMDIR)\memory.cpp + *$(CXX) $(CXXFLAGS) $< -menucmn.obj: $(COMMDIR)\menucmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\menucmn.obj: $(COMMDIR)\menucmn.cpp + *$(CXX) $(CXXFLAGS) $< -mimecmn.obj: $(COMMDIR)\mimecmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.cpp + *$(CXX) $(CXXFLAGS) $< -module.obj: $(COMMDIR)\module.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\module.obj: $(COMMDIR)\module.cpp + *$(CXX) $(CXXFLAGS) $< -msgout.obj: $(COMMDIR)\msgout.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\msgout.obj: $(COMMDIR)\msgout.cpp + *$(CXX) $(CXXFLAGS) $< -mstream.obj: $(COMMDIR)\mstream.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\mstream.obj: $(COMMDIR)\mstream.cpp + *$(CXX) $(CXXFLAGS) $< -nbkbase.obj: $(COMMDIR)\nbkbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.cpp + *$(CXX) $(CXXFLAGS) $< -object.obj: $(COMMDIR)\object.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\object.obj: $(COMMDIR)\object.cpp + *$(CXX) $(CXXFLAGS) $< -odbc.obj: $(COMMDIR)\odbc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\odbc.obj: $(COMMDIR)\odbc.cpp + *$(CXX) $(CXXFLAGS) $< -paper.obj: $(COMMDIR)\paper.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\paper.obj: $(COMMDIR)\paper.cpp + *$(CXX) $(CXXFLAGS) $< -popupcmn.obj: $(COMMDIR)\popupcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\popupcmn.obj: $(COMMDIR)\popupcmn.cpp + *$(CXX) $(CXXFLAGS) $< -prntbase.obj: $(COMMDIR)\prntbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\prntbase.obj: $(COMMDIR)\prntbase.cpp + *$(CXX) $(CXXFLAGS) $< -process.obj: $(COMMDIR)\process.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\process.obj: $(COMMDIR)\process.cpp + *$(CXX) $(CXXFLAGS) $< -protocol.obj: $(COMMDIR)\protocol.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\protocol.obj: $(COMMDIR)\protocol.cpp + *$(CXX) $(CXXFLAGS) $< -quantize.obj: $(COMMDIR)\quantize.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\quantize.obj: $(COMMDIR)\quantize.cpp + *$(CXX) $(CXXFLAGS) $< -radiocmn.obj: $(COMMDIR)\radiocmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.cpp + *$(CXX) $(CXXFLAGS) $< -regex.obj: $(COMMDIR)\regex.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\regex.obj: $(COMMDIR)\regex.cpp + *$(CXX) $(CXXFLAGS) $< -resource.obj: $(COMMDIR)\resource.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\resource.obj: $(COMMDIR)\resource.cpp + *$(CXX) $(CXXFLAGS) $< -sckaddr.obj: $(COMMDIR)\sckaddr.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.cpp + *$(CXX) $(CXXFLAGS) $< -sckfile.obj: $(COMMDIR)\sckfile.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sckfile.obj: $(COMMDIR)\sckfile.cpp + *$(CXX) $(CXXFLAGS) $< -sckipc.obj: $(COMMDIR)\sckipc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sckipc.obj: $(COMMDIR)\sckipc.cpp + *$(CXX) $(CXXFLAGS) $< -sckstrm.obj: $(COMMDIR)\sckstrm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.cpp + *$(CXX) $(CXXFLAGS) $< -settcmn.obj: $(COMMDIR)\settcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\settcmn.obj: $(COMMDIR)\settcmn.cpp + *$(CXX) $(CXXFLAGS) $< -sizer.obj: $(COMMDIR)\sizer.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sizer.obj: $(COMMDIR)\sizer.cpp + *$(CXX) $(CXXFLAGS) $< -socket.obj: $(COMMDIR)\socket.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\socket.obj: $(COMMDIR)\socket.cpp + *$(CXX) $(CXXFLAGS) $< -statbar.obj: $(COMMDIR)\statbar.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\statbar.obj: $(COMMDIR)\statbar.cpp + *$(CXX) $(CXXFLAGS) $< -strconv.obj: $(COMMDIR)\strconv.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\strconv.obj: $(COMMDIR)\strconv.cpp + *$(CXX) $(CXXFLAGS) $< -stream.obj: $(COMMDIR)\stream.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\stream.obj: $(COMMDIR)\stream.cpp + *$(CXX) $(CXXFLAGS) $< -string.obj: $(COMMDIR)\string.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\string.obj: $(COMMDIR)\string.cpp + *$(CXX) $(CXXFLAGS) $< -sysopt.obj: $(COMMDIR)\sysopt.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sysopt.obj: $(COMMDIR)\sysopt.cpp + *$(CXX) $(CXXFLAGS) $< -tbarbase.obj: $(COMMDIR)\tbarbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.cpp + *$(CXX) $(CXXFLAGS) $< -textbuf.obj: $(COMMDIR)\textbuf.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\textbuf.obj: $(COMMDIR)\textbuf.cpp + *$(CXX) $(CXXFLAGS) $< -textcmn.obj: $(COMMDIR)\textcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\textcmn.obj: $(COMMDIR)\textcmn.cpp + *$(CXX) $(CXXFLAGS) $< -textfile.obj: $(COMMDIR)\textfile.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\textfile.obj: $(COMMDIR)\textfile.cpp + *$(CXX) $(CXXFLAGS) $< -timercmn.obj: $(COMMDIR)\timercmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\timercmn.obj: $(COMMDIR)\timercmn.cpp + *$(CXX) $(CXXFLAGS) $< -tokenzr.obj: $(COMMDIR)\tokenzr.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.cpp + *$(CXX) $(CXXFLAGS) $< -toplvcmn.obj: $(COMMDIR)\toplvcmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\toplvcmn.obj: $(COMMDIR)\toplvcmn.cpp + *$(CXX) $(CXXFLAGS) $< -treebase.obj: $(COMMDIR)\treebase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\treebase.obj: $(COMMDIR)\treebase.cpp + *$(CXX) $(CXXFLAGS) $< -txtstrm.obj: $(COMMDIR)\txtstrm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.cpp + *$(CXX) $(CXXFLAGS) $< -unzip.obj: $(COMMDIR)\unzip.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\unzip.obj: $(COMMDIR)\unzip.c + *$(CC) $(CFLAGS) $< -url.obj: $(COMMDIR)\url.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\url.obj: $(COMMDIR)\url.cpp + *$(CXX) $(CXXFLAGS) $< -utilscmn.obj: $(COMMDIR)\utilscmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\utilscmn.obj: $(COMMDIR)\utilscmn.cpp + *$(CXX) $(CXXFLAGS) $< -valgen.obj: $(COMMDIR)\valgen.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\valgen.obj: $(COMMDIR)\valgen.cpp + *$(CXX) $(CXXFLAGS) $< -validate.obj: $(COMMDIR)\validate.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\validate.obj: $(COMMDIR)\validate.cpp + *$(CXX) $(CXXFLAGS) $< -valtext.obj: $(COMMDIR)\valtext.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\valtext.obj: $(COMMDIR)\valtext.cpp + *$(CXX) $(CXXFLAGS) $< -variant.obj: $(COMMDIR)\variant.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\variant.obj: $(COMMDIR)\variant.cpp + *$(CXX) $(CXXFLAGS) $< -wfstream.obj: $(COMMDIR)\wfstream.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\wfstream.obj: $(COMMDIR)\wfstream.cpp + *$(CXX) $(CXXFLAGS) $< -wincmn.obj: $(COMMDIR)\wincmn.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\wincmn.obj: $(COMMDIR)\wincmn.cpp + *$(CXX) $(CXXFLAGS) $< -wxchar.obj: $(COMMDIR)\wxchar.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\wxchar.obj: $(COMMDIR)\wxchar.cpp + *$(CXX) $(CXXFLAGS) $< -wxexpr.obj: $(COMMDIR)\wxexpr.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.cpp + *$(CXX) $(CXXFLAGS) $< -xpmdecod.obj: $(COMMDIR)\xpmdecod.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.cpp + *$(CXX) $(CXXFLAGS) $< -zipstrm.obj: $(COMMDIR)\zipstrm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.cpp + *$(CXX) $(CXXFLAGS) $< -zstream.obj: $(COMMDIR)\zstream.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\zstream.obj: $(COMMDIR)\zstream.cpp + *$(CXX) $(CXXFLAGS) $< -y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c - -# *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c +$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c + *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c $(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c @@ -1150,98 +1118,98 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c # Generic objects (not always compiled, depending on # whether platforms have native implementations) -busyinfo.obj: $(GENDIR)\busyinfo.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\busyinfo.obj: $(GENDIR)\busyinfo.cpp + *$(CXX) $(CXXFLAGS) $< -calctrl.obj: $(GENDIR)\calctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\calctrl.obj: $(GENDIR)\calctrl.cpp + *$(CXX) $(CXXFLAGS) $< -choicdgg.obj: $(GENDIR)\choicdgg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\choicdgg.obj: $(GENDIR)\choicdgg.cpp + *$(CXX) $(CXXFLAGS) $< -dcbuffer.obj: $(GENDIR)\dcbuffer.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.cpp + *$(CXX) $(CXXFLAGS) $< -dcpsg.obj: $(GENDIR)\dcpsg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dcpsg.obj: $(GENDIR)\dcpsg.cpp + *$(CXX) $(CXXFLAGS) $< -dirctrlg.obj: $(GENDIR)\dirctrlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.cpp + *$(CXX) $(CXXFLAGS) $< -dragimgg.obj: $(GENDIR)\dragimgg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\dragimgg.obj: $(GENDIR)\dragimgg.cpp + *$(CXX) $(CXXFLAGS) $< -grid.obj: $(GENDIR)\grid.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\grid.obj: $(GENDIR)\grid.cpp + *$(CXX) $(CXXFLAGS) $< -gridctrl.obj: $(GENDIR)\gridctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gridctrl.obj: $(GENDIR)\gridctrl.cpp + *$(CXX) $(CXXFLAGS) $< -gridsel.obj: $(GENDIR)\gridsel.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\gridsel.obj: $(GENDIR)\gridsel.cpp + *$(CXX) $(CXXFLAGS) $< -laywin.obj: $(GENDIR)\laywin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\laywin.obj: $(GENDIR)\laywin.cpp + *$(CXX) $(CXXFLAGS) $< -logg.obj: $(GENDIR)\logg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\logg.obj: $(GENDIR)\logg.cpp + *$(CXX) $(CXXFLAGS) $< -numdlgg.obj: $(GENDIR)\numdlgg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\numdlgg.obj: $(GENDIR)\numdlgg.cpp + *$(CXX) $(CXXFLAGS) $< -panelg.obj: $(GENDIR)\panelg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\panelg.obj: $(GENDIR)\panelg.cpp + *$(CXX) $(CXXFLAGS) $< -progdlgg.obj: $(GENDIR)\progdlgg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\progdlgg.obj: $(GENDIR)\progdlgg.cpp + *$(CXX) $(CXXFLAGS) $< -prop.obj: $(GENDIR)\prop.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\prop.obj: $(GENDIR)\prop.cpp + *$(CXX) $(CXXFLAGS) $< -propform.obj: $(GENDIR)\propform.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\propform.obj: $(GENDIR)\propform.cpp + *$(CXX) $(CXXFLAGS) $< -proplist.obj: $(GENDIR)\proplist.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\proplist.obj: $(GENDIR)\proplist.cpp + *$(CXX) $(CXXFLAGS) $< -sashwin.obj: $(GENDIR)\sashwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\sashwin.obj: $(GENDIR)\sashwin.cpp + *$(CXX) $(CXXFLAGS) $< -scrlwing.obj: $(GENDIR)\scrlwing.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\scrlwing.obj: $(GENDIR)\scrlwing.cpp + *$(CXX) $(CXXFLAGS) $< -spinctlg.obj: $(GENDIR)\spinctlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\spinctlg.obj: $(GENDIR)\spinctlg.cpp + *$(CXX) $(CXXFLAGS) $< -splash.obj: $(GENDIR)\splash.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\splash.obj: $(GENDIR)\splash.cpp + *$(CXX) $(CXXFLAGS) $< -splitter.obj: $(GENDIR)\splitter.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\splitter.obj: $(GENDIR)\splitter.cpp + *$(CXX) $(CXXFLAGS) $< -statusbr.obj: $(GENDIR)\statusbr.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\statusbr.obj: $(GENDIR)\statusbr.cpp + *$(CXX) $(CXXFLAGS) $< -tbarsmpl.obj: $(GENDIR)\tbarsmpl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.cpp + *$(CXX) $(CXXFLAGS) $< -textdlgg.obj: $(GENDIR)\textdlgg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\textdlgg.obj: $(GENDIR)\textdlgg.cpp + *$(CXX) $(CXXFLAGS) $< -tipdlg.obj: $(GENDIR)\tipdlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tipdlg.obj: $(GENDIR)\tipdlg.cpp + *$(CXX) $(CXXFLAGS) $< -tipwin.obj: $(GENDIR)\tipwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\tipwin.obj: $(GENDIR)\tipwin.cpp + *$(CXX) $(CXXFLAGS) $< -treectlg.obj: $(GENDIR)\treectlg.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\treectlg.obj: $(GENDIR)\treectlg.cpp + *$(CXX) $(CXXFLAGS) $< -treelay.obj: $(GENDIR)\treelay.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\treelay.obj: $(GENDIR)\treelay.cpp + *$(CXX) $(CXXFLAGS) $< -wizard.obj: $(GENDIR)\wizard.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\wizard.obj: $(GENDIR)\wizard.cpp + *$(CXX) $(CXXFLAGS) $< @@ -1249,65 +1217,65 @@ wizard.obj: $(GENDIR)\wizard.cpp ######################################################## # HTML objects (always compiled) -helpctrl.obj: $(HTMLDIR)\helpctrl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpctrl.obj: $(HTMLDIR)\helpctrl.cpp + *$(CXX) $(CXXFLAGS) $< -helpdata.obj: $(HTMLDIR)\helpdata.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpdata.obj: $(HTMLDIR)\helpdata.cpp + *$(CXX) $(CXXFLAGS) $< -helpfrm.obj: $(HTMLDIR)\helpfrm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\helpfrm.obj: $(HTMLDIR)\helpfrm.cpp + *$(CXX) $(CXXFLAGS) $< -htmlcell.obj: $(HTMLDIR)\htmlcell.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\htmlcell.obj: $(HTMLDIR)\htmlcell.cpp + *$(CXX) $(CXXFLAGS) $< -htmlfilt.obj: $(HTMLDIR)\htmlfilt.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\htmlfilt.obj: $(HTMLDIR)\htmlfilt.cpp + *$(CXX) $(CXXFLAGS) $< -htmlpars.obj: $(HTMLDIR)\htmlpars.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\htmlpars.obj: $(HTMLDIR)\htmlpars.cpp + *$(CXX) $(CXXFLAGS) $< -htmltag.obj: $(HTMLDIR)\htmltag.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\htmltag.obj: $(HTMLDIR)\htmltag.cpp + *$(CXX) $(CXXFLAGS) $< -htmlwin.obj: $(HTMLDIR)\htmlwin.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\htmlwin.obj: $(HTMLDIR)\htmlwin.cpp + *$(CXX) $(CXXFLAGS) $< -htmprint.obj: $(HTMLDIR)\htmprint.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\htmprint.obj: $(HTMLDIR)\htmprint.cpp + *$(CXX) $(CXXFLAGS) $< -m_dflist.obj: $(HTMLDIR)\m_dflist.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_dflist.obj: $(HTMLDIR)\m_dflist.cpp + *$(CXX) $(CXXFLAGS) $< -m_fonts.obj: $(HTMLDIR)\m_fonts.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_fonts.obj: $(HTMLDIR)\m_fonts.cpp + *$(CXX) $(CXXFLAGS) $< -m_hline.obj: $(HTMLDIR)\m_hline.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_hline.obj: $(HTMLDIR)\m_hline.cpp + *$(CXX) $(CXXFLAGS) $< -m_image.obj: $(HTMLDIR)\m_image.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_image.obj: $(HTMLDIR)\m_image.cpp + *$(CXX) $(CXXFLAGS) $< -m_layout.obj: $(HTMLDIR)\m_layout.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_layout.obj: $(HTMLDIR)\m_layout.cpp + *$(CXX) $(CXXFLAGS) $< -m_links.obj: $(HTMLDIR)\m_links.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_links.obj: $(HTMLDIR)\m_links.cpp + *$(CXX) $(CXXFLAGS) $< -m_list.obj: $(HTMLDIR)\m_list.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_list.obj: $(HTMLDIR)\m_list.cpp + *$(CXX) $(CXXFLAGS) $< -m_pre.obj: $(HTMLDIR)\m_pre.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_pre.obj: $(HTMLDIR)\m_pre.cpp + *$(CXX) $(CXXFLAGS) $< -m_style.obj: $(HTMLDIR)\m_style.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_style.obj: $(HTMLDIR)\m_style.cpp + *$(CXX) $(CXXFLAGS) $< -m_tables.obj: $(HTMLDIR)\m_tables.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\m_tables.obj: $(HTMLDIR)\m_tables.cpp + *$(CXX) $(CXXFLAGS) $< -winpars.obj: $(HTMLDIR)\winpars.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +$(OUTPUTDIR)\winpars.obj: $(HTMLDIR)\winpars.cpp + *$(CXX) $(CXXFLAGS) $< diff --git a/src/png/makefile.wat b/src/png/makefile.wat index c6c6c8ae48..8d5b96706f 100644 --- a/src/png/makefile.wat +++ b/src/png/makefile.wat @@ -3,6 +3,7 @@ # File: makefile.wat # Author: Julian Smart # Created: 1998 +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch # # Makefile : Builds PNG library for Watcom C++, WIN32 @@ -13,25 +14,42 @@ EXTRACPPFLAGS=-i=..\zlib WXLIB = $(WXDIR)\lib -LIBTARGET = $(WXLIB)\png.lib +LIBTARGET = $(WXLIB)\png$(WATCOM_SUFFIX).lib -OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj & - pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj & - pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj +OBJECTS = & + $(OUTPUTDIR)\png.obj & + $(OUTPUTDIR)\pngread.obj & + $(OUTPUTDIR)\pngrtran.obj & + $(OUTPUTDIR)\pngrutil.obj & + $(OUTPUTDIR)\pngpread.obj & + $(OUTPUTDIR)\pngtrans.obj & + $(OUTPUTDIR)\pngwrite.obj & + $(OUTPUTDIR)\pngwtran.obj & + $(OUTPUTDIR)\pngwutil.obj & + $(OUTPUTDIR)\pngerror.obj & + $(OUTPUTDIR)\pngmem.obj & + $(OUTPUTDIR)\pngwio.obj & + $(OUTPUTDIR)\pngrio.obj & + $(OUTPUTDIR)\pngget.obj & + $(OUTPUTDIR)\pngset.obj -all: $(OBJECTS) $(LIBTARGET) +all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ + +LBCFILE=$(OUTPUTDIR)\png.lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) clean: .SYMBOLIC - -erase *.obj + -erase $(OUTPUTDIR)\*.obj -erase $(LIBTARGET) - -erase *.pch - -erase *.err - -erase *.lbc + -erase $(OUTPUTDIR)\*.pch + -erase $(OUTPUTDIR)\*.err + -erase $(OUTPUTDIR)\*.lbc cleanall: clean diff --git a/src/regex/makefile.wat b/src/regex/makefile.wat index b73464c60c..ba3b063441 100644 --- a/src/regex/makefile.wat +++ b/src/regex/makefile.wat @@ -3,6 +3,7 @@ # File: makefile.wat # Author: Julian Smart # Created: 1998 +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch # # Makefile : Builds REGEX library for Watcom C++, WIN32 @@ -13,20 +14,24 @@ EXTRACPPFLAGS=-DPOSIX_MISTAKE WXLIB = $(WXDIR)\lib -LIBTARGET = $(WXLIB)\regex.lib +LIBTARGET = $(WXLIB)\regex$(WATCOM_SUFFIX).lib -OBJECTS= & - regcomp.obj & - regexec.obj & - regerror.obj & - regfree.obj +OBJECTS = & + $(OUTPUTDIR)\regcomp.obj & + $(OUTPUTDIR)\regexec.obj & + $(OUTPUTDIR)\regerror.obj & + $(OUTPUTDIR)\regfree.obj -all: $(OBJECTS) $(LIBTARGET) +all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ + +LBCFILE=$(OUTPUTDIR)\regex.lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) clean: .SYMBOLIC -erase *.obj diff --git a/src/tiff/makefile.wat b/src/tiff/makefile.wat index 4f8d5cfc38..f84784545a 100644 --- a/src/tiff/makefile.wat +++ b/src/tiff/makefile.wat @@ -3,6 +3,7 @@ # File: makefile.wat # Author: Julian Smart # Created: 1998 +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch # # Makefile : Builds TIFF library for Watcom C++, WIN32 # This makefile has to rename files because apparently Watcom C++ @@ -14,45 +15,63 @@ EXTRACPPFLAGS=-i=..\zlib !include $(WXDIR)\src\makewat.env +# set RENAME to 1 to rename the files to the short names -- this is needed +# with older Watcom versions +# RENAME=1 + +!ifeq RENAME 1 +TIFF= +EXTRACPPFLAGS+=-dwxUSE_SHORTNAMES +!else +TIFF=tif_ +!endif + WXLIB = $(WXDIR)\lib -LIBTARGET = $(WXLIB)\tiff.lib +LIBTARGET = $(WXLIB)\tiff$(WATCOM_SUFFIX).lib OBJECTS= & - _aux.obj & - close.obj & - codec.obj & - compress.obj & - dir.obj & - dirinfo.obj & - dirread.obj & - dirwrite.obj & - dumpmode.obj & - error.obj & - fax3.obj & - fax3sm.obj & - flush.obj & - getimage.obj & - jpeg.obj & - luv.obj & - lzw.obj & - next.obj & - open.obj & - packbits.obj & - pixarlog.obj & - predict.obj & - print.obj & - read.obj & - strip.obj & - swab.obj & - thunder.obj & - tile.obj & - version.obj & - warning.obj & - win32.obj & - write.obj & - zip.obj +!ifeq RENAME 1 + $(OUTPUTDIR)\_aux.obj & +!else + $(OUTPUTDIR)\tif_aux.obj & +!endif + $(OUTPUTDIR)\$(TIFF)close.obj & + $(OUTPUTDIR)\$(TIFF)codec.obj & + $(OUTPUTDIR)\$(TIFF)compress.obj & + $(OUTPUTDIR)\$(TIFF)dir.obj & + $(OUTPUTDIR)\$(TIFF)dirinfo.obj & + $(OUTPUTDIR)\$(TIFF)dirread.obj & + $(OUTPUTDIR)\$(TIFF)dirwrite.obj & + $(OUTPUTDIR)\$(TIFF)dumpmode.obj & + $(OUTPUTDIR)\$(TIFF)error.obj & + $(OUTPUTDIR)\$(TIFF)fax3.obj & + $(OUTPUTDIR)\$(TIFF)fax3sm.obj & + $(OUTPUTDIR)\$(TIFF)flush.obj & + $(OUTPUTDIR)\$(TIFF)getimage.obj & + $(OUTPUTDIR)\$(TIFF)jpeg.obj & + $(OUTPUTDIR)\$(TIFF)luv.obj & + $(OUTPUTDIR)\$(TIFF)lzw.obj & + $(OUTPUTDIR)\$(TIFF)next.obj & + $(OUTPUTDIR)\$(TIFF)open.obj & + $(OUTPUTDIR)\$(TIFF)packbits.obj & + $(OUTPUTDIR)\$(TIFF)pixarlog.obj & + $(OUTPUTDIR)\$(TIFF)predict.obj & + $(OUTPUTDIR)\$(TIFF)print.obj & + $(OUTPUTDIR)\$(TIFF)read.obj & + $(OUTPUTDIR)\$(TIFF)strip.obj & + $(OUTPUTDIR)\$(TIFF)swab.obj & + $(OUTPUTDIR)\$(TIFF)thunder.obj & + $(OUTPUTDIR)\$(TIFF)tile.obj & + $(OUTPUTDIR)\$(TIFF)version.obj & + $(OUTPUTDIR)\$(TIFF)warning.obj & + $(OUTPUTDIR)\$(TIFF)win32.obj & + $(OUTPUTDIR)\$(TIFF)write.obj & + $(OUTPUTDIR)\$(TIFF)zip.obj +all: $(OUTPUTDIR) $(RENAME) $(LIBTARGET) .SYMBOLIC + +!ifeq RENAME 1 rename: .SYMBOLIC copy tif_predict.h tif_pred.h copy tif_aux.c _aux.c @@ -88,13 +107,16 @@ rename: .SYMBOLIC copy tif_win32.c win32.c copy tif_write.c write.c copy tif_zip.c zip.c +!endif -all: rename $(OBJECTS) $(LIBTARGET) +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ +LBCFILE=$(OUTPUTDIR)\tiff.lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) clean: .SYMBOLIC -erase *.obj @@ -102,6 +124,7 @@ clean: .SYMBOLIC -erase *.pch -erase *.err -erase *.lbc +!ifeq RENAME 1 -erase tif_pred.h -erase _aux.c -erase close.c @@ -136,6 +159,7 @@ clean: .SYMBOLIC -erase win32.c -erase write.c -erase zip.c +!endif cleanall: clean diff --git a/src/tiff/tif_lzw.c b/src/tiff/tif_lzw.c index d739e6f18d..16c2b7422f 100644 --- a/src/tiff/tif_lzw.c +++ b/src/tiff/tif_lzw.c @@ -37,7 +37,7 @@ * The original Berkeley copyright notice appears below in its entirety. */ /* Watcom C++ (or its make utility) doesn't like long filenames */ -#ifdef __WATCOMC__ +#ifdef wxUSE_SHORTNAMES #include "tif_pred.h" #else #include "tif_predict.h" diff --git a/src/tiff/tif_predict.c b/src/tiff/tif_predict.c index 137a2fb3a4..e47331f321 100644 --- a/src/tiff/tif_predict.c +++ b/src/tiff/tif_predict.c @@ -31,7 +31,7 @@ */ #include "tiffiop.h" /* Watcom C++ (or its make utility) doesn't like long filenames */ -#ifdef __WATCOMC__ +#ifdef wxUSE_SHORTNAMES #include "tif_pred.h" #else #include "tif_predict.h" diff --git a/src/zlib/makefile.wat b/src/zlib/makefile.wat index 3ea09da555..f6fbce4436 100644 --- a/src/zlib/makefile.wat +++ b/src/zlib/makefile.wat @@ -1,103 +1,53 @@ -# Makefile for zlib -# Watcom 10a +############################################################################## +# Name: src/zlib/makefile.wat +# Purpose: build zlib using Watcom 11.0+ compiler +# Author: Vadim Zeitlin +# Created: 21.01.03 +# RCS-ID: $Id$ +# Copyright: (c) 2003 Vadim Zeitlin +# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch +# Licence: wxWindows licence +############################################################################## -# This version of the zlib makefile was adapted by Chris Young for use -# with Watcom 10a 32-bit protected mode flat memory model. It was created -# for use with POV-Ray ray tracer and you may choose to edit the CFLAGS to -# suit your needs but the -DMSDOS is required. -# -- Chris Young 76702.1655@compuserve.com +WXDIR = ..\.. +OUTPUTDIR=watcom -# To use, do "wmake -f makefile.wat" +!include $(WXDIR)\src\makewat.env -# See zconf.h for details about the memory requirements. - -# ------------- Watcom 10a ------------- -MODEL=-mf -CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DWIN32 -CC=wcc386 -LD=wcl386 -LIB=wlib -b -c -LDFLAGS= -O=.obj -LIBTARGET=..\..\lib\zlib.lib +LIBTARGET=$(WXDIR)\lib\zlib$(WATCOM_SUFFIX).lib # variables -OBJECTS=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) & - trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) & - infutil$(O) inffast$(O) +OBJECTS = & + $(OUTPUTDIR)\adler32.obj & + $(OUTPUTDIR)\compress.obj & + $(OUTPUTDIR)\crc32.obj & + $(OUTPUTDIR)\gzio.obj & + $(OUTPUTDIR)\uncompr.obj & + $(OUTPUTDIR)\deflate.obj & + $(OUTPUTDIR)\trees.obj & + $(OUTPUTDIR)\zutil.obj & + $(OUTPUTDIR)\inflate.obj & + $(OUTPUTDIR)\infblock.obj & + $(OUTPUTDIR)\inftrees.obj & + $(OUTPUTDIR)\infcodes.obj & + $(OUTPUTDIR)\infutil.obj & + $(OUTPUTDIR)\inffast.obj # all: test -all: $(LIBTARGET) +all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC -adler32.obj: adler32.c zutil.h zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -compress.obj: compress.c zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -crc32.obj: crc32.c zutil.h zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -gzio.obj: gzio.c zutil.h zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h & - infcodes.h infutil.h - $(CC) $(CFLAGS) $*.c - -infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h & - infcodes.h inffast.h - $(CC) $(CFLAGS) $*.c - -inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h - $(CC) $(CFLAGS) $*.c - -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h - $(CC) $(CFLAGS) $*.c - -infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h - $(CC) $(CFLAGS) $*.c - -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h - $(CC) $(CFLAGS) $*.c - -trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -uncompr.obj: uncompr.c zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -zutil.obj: zutil.c zutil.h zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -example.obj: example.c zlib.h zconf.h - $(CC) $(CFLAGS) $*.c - -minigzip.obj: minigzip.c zlib.h zconf.h - $(CC) $(CFLAGS) $*.c +$(OUTPUTDIR): + @if not exist $^@ mkdir $^@ +LBCFILE=$(OUTPUTDIR)\zlib.lbc $(LIBTARGET) : $(OBJECTS) - %create tmp.lbc - @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i - wlib /b /c /n /p=512 $^@ @tmp.lbc - - -example.exe: example.obj $(LIBTARGET) - $(LD) $(LDFLAGS) example.obj $(LIBTARGET) - -minigzip.exe: minigzip.obj $(LIBTARGET) - $(LD) $(LDFLAGS) minigzip.obj $(LIBTARGET) - -test: minigzip.exe example.exe - example - echo hello world | minigzip | minigzip -d >test - type test + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) clean: .SYMBOLIC -erase *.obj -erase *.exe - -erase $(LIBTARGET) + -erase $(LIBTARGET) +