Borland makefiles now keep output apart

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index be9ebf6ab19746fb0ad9c1a7b9a532ada543a755..7210da753fc775897c1b24859f2cd192bdfb4e92 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -18,7 +18,7 @@
 
         $file =~ s/cp?p?$/obj/;
         $obj = "\$(UNIVDIR)\\" . $file . " ";
-        $project{"WXUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $project{"WXUNIVOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
     }
 
     foreach $file (sort keys %wxUNIV) {
@@ -26,14 +26,14 @@
 
         $file =~ s/cp?p?$/obj/;
         $obj = "\$(UNIVTHEMEDIR)\\" . $file . " ";
-        $project{"WXUNIVTHEMEOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $project{"WXUNIVTHEMEOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
     }
 
     foreach $file (sort keys %wxHTML) {
         next if $wxHTML{$file} =~ /\b16\b/;
 
         $file =~ s/cp?p?$/obj/;
-        $project{"WXHTMLOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $project{"WXHTMLOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
     }
 
     foreach $file (sort keys %wxCommon) {
@@ -41,7 +41,7 @@
 
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $obj = "\$(OBJ_PATH)\\" . $file . " ";
         $project{"WXCOMMONOBJS"} .= $obj;
         $project{"WXCOBJS"} .= $obj if $isCFile;
     }
@@ -50,18 +50,11 @@
     foreach $file (sort keys %wxMSW) {
         next if $wxMSW{$file} =~ /\b16\b/;
 
-#!        if ( $file =~ /^automtn/ ) {
-#!            #! comment in old makefile.b32 seems to imply that this file can not
-#!            #! be compiled with Borland (leads to crash in oleauto sample)
-#!            No longer true, at least for BC++ 5.2
-#!            next;
-#!        }
-
         $isCFile = $file =~ /\.c$/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
-        my $obj = "\$(MSWDIR)\\" . $file . " ";
+        my $obj = "\$(OBJ_PATH)\\" . $file . " ";
 
         $project{"WXMSWOBJS"} .= $obj;
         if ( $isOleObj ) {
@@ -75,18 +68,11 @@
     foreach $file (sort keys %wxMSW) {
         next unless $wxMSW{$file} =~ /\b(L|B)\b/;
 
-#!        if ( $file =~ /^automtn/ ) {
-#!            #! comment in old makefile.b32 seems to imply that this file can not
-#!            #! be compiled with Borland (leads to crash in oleauto sample)
-#!            No longer true, at least for BC++ 5.2
-#!            next;
-#!        }
-
         $isCFile = $file =~ /\.c$/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
-        my $obj = "\$(MSWDIR)\\" . $file . " ";
+        my $obj = "\$(OBJ_PATH)\\" . $file . " ";
 
         $project{"WXMSWUNIVOBJS"} .= $obj;
         if ( $isOleObj ) {
@@ -102,7 +88,7 @@
         next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
 
         $file =~ s/cp?p?$/obj/;
-        $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $project{"WXGENERICOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
     }
 
 #! Generic Dir for UNIV Port
@@ -118,7 +104,7 @@
                $project{"WXUNIVOBJS"} =~ /\b$filereal\b/;
 
         
-        $project{"WXGENERICUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $project{"WXGENERICUNIVOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
     }
 
 #$}
@@ -171,7 +157,6 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
-#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
 PERIPH_LIBS=
 PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
@@ -180,7 +165,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
+LIBS= cw32mti import32 ole2w32 odbc32 zlib_$(DEBUG_SUFFIX) png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) regex_$(DEBUG_SUFFIX)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -220,7 +205,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:    wx
 
-wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(ARCHINCDIR)\wx makeoutdir makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 all:    wx
 
@@ -235,15 +220,18 @@ makearchsetuph:
      copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH)
      cd $(WXDIR)\src\msw
 
+makeoutdir:
+    -mkdir $(OBJ_PATH)
+
 $(ARCHINCDIR)\wx:
     -mkdir $(ARCHINCDIR)
     -mkdir $(ARCHINCDIR)\wx
-    -erase $(CFG)
+    -if exist $(CFG) $(RM) $(CFG)
 
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-        -erase $(LIBTARGET)
+    -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
     tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
@@ -279,10 +267,11 @@ version.res:
     $_ = $project{"WXMSWUNIVOBJS"};
     my @objs = split;
     foreach (@objs) {
-        $text .= $_ . ": ";
-        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
+        $text .= $_ . ": ";        
+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/OBJ_PATH/OLEDIR/; }
         $suffix = $project{"WXCUNIVOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/obj$/$suffix/;
+       s/OBJ_PATH/MSWDIR/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -296,10 +285,11 @@ version.res:
     $_ = $project{"WXMSWOBJS"};
     my @objs = split;
     foreach (@objs) {
-        $text .= $_ . ": ";
-        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
+        $text .= $_ . ": ";    
+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/OBJ_PATH/OLEDIR/; }
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/obj$/$suffix/;
+       s/OBJ_PATH/MSWDIR/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -313,7 +303,7 @@ version.res:
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/MSWDIR/UNIVDIR/;
+        s/OBJ_PATH/UNIVDIR/;
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
@@ -328,7 +318,7 @@ version.res:
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/MSWDIR/UNIVTHEMEDIR/;
+        s/OBJ_PATH/UNIVTHEMEDIR/;
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
@@ -345,7 +335,7 @@ version.res:
     foreach (@objs) {
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
-        s/MSWDIR/COMMDIR/;
+        s/OBJ_PATH/COMMDIR/;
         s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
@@ -363,7 +353,7 @@ version.res:
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/MSWDIR/GENDIR/;
+        s/OBJ_PATH/GENDIR/;
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
@@ -380,7 +370,7 @@ version.res:
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/MSWDIR/GENDIR/;
+        s/OBJ_PATH/GENDIR/;
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
@@ -395,7 +385,7 @@ version.res:
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/MSWDIR/HTMLDIR/;
+        s/OBJ_PATH/HTMLDIR/;
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
@@ -419,58 +409,58 @@ all_execs:
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL)
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL)
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32
     copy &&!
 -Hc
--H=$(WXDIR)\src\msw\wx32.csm
+-H=$(OBJ_PATH)\wx32.csm
 -3
 -d
 -a1 # byte alignment
@@ -494,15 +484,21 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
+cleancfg:
+    -if exist $(OBJ_PATH)\*.cfg $(RM) $(OBJ_PATH)\*.cfg    
+
 clean: $(PERIPH_CLEAN_TARGET)
-    -erase $(WXLIBDIR)\wx.tds
-    -erase $(WXLIBDIR)\wx.il?
-    -erase *.obj
-    -erase *.pch
-    -erase *.csm
-    -erase "wx32.#??"
+    -if exist $(WXLIBDIR)\wx.il? $(RM) $(WXLIBDIR)\wx.tds
+    -if exist $(WXLIBDIR)\wx.il? $(RM) $(WXLIBDIR)\wx.il?
+    -if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj    
+    -if exist $(OBJ_PATH)\*.csm $(RM) $(OBJ_PATH)\*.csm    
+    -if exist "$(OBJ_PATH)\wx32.#??" $(RM) "$(OBJ_PATH)\wx32.#??"
+    -if exist *.pch $(RM) *.pch
+    -if exist *.csm $(RM) *.csm
+    -if exist *.obj $(RM) *.obj
+    -if exist "wx32.#??" $(RM) "wx32.#??"
 
-cleanall: clean
+cleanall: clean cleancfg
 
 
 # Making documents
@@ -592,7 +588,7 @@ allpdfrtf: pdfrtf portingpdfrtf
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
-        -erase wx.ph
+        -if exist wx.ph $(RM)  wx.ph
         hc wx
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
@@ -600,7 +596,7 @@ $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
 
 $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
         cd $(DOCDIR)/latex/porting
-        -erase porting.ph
+        -if exist porting.ph $(RM)  porting.ph
         hc porting
         move porting.hlp $(DOCDIR)\winhelp\porting.hlp
         move porting.cnt $(DOCDIR)\winhelp\porting.cnt
@@ -608,7 +604,7 @@ $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOC
 
 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
-        -erase techref.ph
+        -if exist techref.ph $(RM)  techref.ph
         hc techref
         move techref.hlp $(DOCDIR)\winhelp\techref.hlp
         move techref.cnt $(DOCDIR)\winhelp\techref.cnt
@@ -654,10 +650,10 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-        -erase $(DOCDIR)\html\wx\*.con
-        -erase $(DOCDIR)\html\wx\*.ref
-        -erase $(DOCDIR)\latex\wx\*.con
-        -erase $(DOCDIR)\latex\wx\*.ref
+        -if exist $(DOCDIR)\html\wx\*.con $(RM)  $(DOCDIR)\html\wx\*.con
+        -if exist $(DOCDIR)\html\wx\*.ref $(RM)  $(DOCDIR)\html\wx\*.ref
+        -if exist $(DOCDIR)\latex\wx\*.con $(RM)  $(DOCDIR)\latex\wx\*.con
+        -if exist $(DOCDIR)\latex\wx\*.ref $(RM)  $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
 $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
@@ -670,10 +666,10 @@ $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
         cd $(DOCDIR)\latex\porting
         -mkdir $(DOCDIR)\html\porting
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-        -erase $(DOCDIR)\html\porting\*.con
-        -erase $(DOCDIR)\html\porting\*.ref
-        -erase $(DOCDIR)\latex\porting\*.con
-        -erase $(DOCDIR)\latex\porting\*.ref
+        -if exist $(DOCDIR)\html\porting\*.con $(RM)  $(DOCDIR)\html\porting\*.con
+        -if exist $(DOCDIR)\html\porting\*.ref $(RM)  $(DOCDIR)\html\porting\*.ref
+        -if exist $(DOCDIR)\latex\porting\*.con $(RM)  $(DOCDIR)\latex\porting\*.con
+        -if exist $(DOCDIR)\latex\porting\*.ref $(RM)  $(DOCDIR)\latex\porting\*.ref
         cd $(THISDIR)
 
 $(WXDIR)\docs\latex\wx\manual.dvi:  $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
@@ -741,6 +737,12 @@ MFTYPE=b32
 # makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
 
 self:
+!if "$(TM)"=="" 
+       @echo Error in Environment!
+       @echo Please set TM in the environment to the directory containing tmake binaries
+       @echo eg set TM=c:\wx\tmake\bin
+!else
     cd $(WXWIN)\distrib\msw\tmake
-    tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+    perl $(TM)\tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
     copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+!endif

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 04869b7bf82eb30ecbd587b7eb8dc4e4fbbc4467..1f18abb765d22be8b24840ca4d050ed9ea1fefe3 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -239,12 +239,16 @@ Compiling using the makefiles (updated 24 Sept 02):
    You may like to use the short form as shown by a dos directory listing ;
    eg instead of c:\wxwindows-2.5.0 use c:\wxwind~1.4
    Reboot if needed for the changes to autoexec.bat to take effect.
+
 2. Change directory to src\msw. Type 'make -f makefile.b32' to
    make the wxWindows core library. Ignore the compiler warnings.
    This produces a library in the wxwindows\lib directory called
    wx32ds.lib
+
 3. Change directory to a sample or demo such as samples\minimal, and type
-  'make -f makefile.b32'. This produces a windows exe file
+  'make -f makefile.b32'. This produces a windows exe file - by default 
+   in the BORL subdirectory (see note 9)
+
 4. For release versions, recompile wxWindows and samples using
    'make -f makefile.b32 clean'
    'make -f makefile.b32 FINAL=1'
@@ -291,6 +295,14 @@ Compiling using the makefiles (updated 24 Sept 02):
    There is a sample\console directory and in this type
    'make -f makefile.b32 wxUSE_GUI=0'
 
+9. OUTPUTDIR may be set to the name of the directory where you want all the
+   object files to be generated (the library files are always created in
+   %WXWIN%\lib). Compilation will fail if you set it to an empty string 
+   to create them in the same directory as the source. If you change OUTPUTDIR, 
+   make sure that it does not have a trailing backslash!
+   In the samples, you may use EXEDIR=adir to build the samples in adir. Setting
+   EXEDIR=. will build in the current directory,
+
 Note (0): This provides the ability to produce separate wxwindows libraries
    for different purposes, and only have to rebuild the applications
 
@@ -397,7 +409,7 @@ There are several makefile variables which may be modified:
 
 - OUTPUTDIR may be set to the name of the directory where you want all the
   object files to be generated (the library files are always created in
-  %WXWIN\lib). Compilation will fail if you set it to an empty string 
+  %WXWIN%\lib). Compilation will fail if you set it to an empty string 
   to create them in the same directory as the source. If you change OUTPUTDIR, 
   make sure that it does not have a trailing backslash!
 

diff --git a/src/jpeg/makefile.b32 b/src/jpeg/makefile.b32
index de0ff66c622ce09dc8dfcf1ec3d958eac532d378..fbcb6fd442b2ab67d283921533a74a0e7b228949 100644 (file)
--- a/src/jpeg/makefile.b32
+++ b/src/jpeg/makefile.b32
@@ -2,77 +2,171 @@
 # File:                makefile.b32
 # Author:      Julian Smart
 # Created:     1993
-# Updated:     
+# Updated:
 # Copyright:
 #
 # "%W% %G%"
 #
 # Makefile : Builds JPEG library (BC++ 32-bit)
 
-# WXWIN and BCCDIR are set by parent make
-
-LIBTARGET =..\..\lib\jpeg.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)
+LIBTARGET=jpeg
+WXWIN=..\..
+
+!include ..\makeb32.env
+
+SYSDEPMEM= \
+       $(OBJ_PATH)\jmemnobs.obj
+
 # library object files common to compression and decompression
-COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)
+COMOBJECTS= \
+       $(OBJ_PATH)\jcomapi.obj \
+       $(OBJ_PATH)\jutils.obj \
+       $(OBJ_PATH)\jerror.obj \
+       $(OBJ_PATH)\jmemmgr.obj \
+       $(SYSDEPMEM)
+
 # 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= \
+       $(OBJ_PATH)\jcapimin.obj \
+       $(OBJ_PATH)\jcapistd.obj \
+       $(OBJ_PATH)\jctrans.obj \
+       $(OBJ_PATH)\jcparam.obj \
+       $(OBJ_PATH)\jdatadst.obj \
+       $(OBJ_PATH)\jcinit.obj \
+       $(OBJ_PATH)\jcmaster.obj \
+       $(OBJ_PATH)\jcmarker.obj \
+       $(OBJ_PATH)\jcmainct.obj \
+       $(OBJ_PATH)\jcprepct.obj \
+       $(OBJ_PATH)\jccoefct.obj \
+       $(OBJ_PATH)\jccolor.obj \
+       $(OBJ_PATH)\jcsample.obj \
+       $(OBJ_PATH)\jchuff.obj \
+       $(OBJ_PATH)\jcphuff.obj \
+       $(OBJ_PATH)\jcdctmgr.obj \
+       $(OBJ_PATH)\jfdctfst.obj \
+       $(OBJ_PATH)\jfdctflt.obj \
+       $(OBJ_PATH)\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= \
+       $(OBJ_PATH)\jdapimin.obj \
+       $(OBJ_PATH)\jdapistd.obj \
+       $(OBJ_PATH)\jdtrans.obj \
+       $(OBJ_PATH)\jdatasrc.obj \
+       $(OBJ_PATH)\jdmaster.obj \
+       $(OBJ_PATH)\jdinput.obj \
+       $(OBJ_PATH)\jdmarker.obj \
+       $(OBJ_PATH)\jdhuff.obj \
+       $(OBJ_PATH)\jdphuff.obj \
+       $(OBJ_PATH)\jdmainct.obj \
+       $(OBJ_PATH)\jdcoefct.obj \
+       $(OBJ_PATH)\jdpostct.obj \
+       $(OBJ_PATH)\jddctmgr.obj \
+       $(OBJ_PATH)\jidctfst.obj \
+       $(OBJ_PATH)\jidctflt.obj \
+       $(OBJ_PATH)\jidctint.obj \
+       $(OBJ_PATH)\jidctred.obj \
+       $(OBJ_PATH)\jdsample.obj \
+       $(OBJ_PATH)\jdcolor.obj \
+       $(OBJ_PATH)\jquant1.obj \
+       $(OBJ_PATH)\jquant2.obj \
+       $(OBJ_PATH)\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
 
-!include $(WXWIN)\src\makelib.b32
+$(OBJ_PATH)\jmemnobs.obj: jmemnobs.c
+
+$(OBJ_PATH)\jcomapi.obj: jcomapi.c
+
+$(OBJ_PATH)\jutils.obj: jutils.c
+
+$(OBJ_PATH)\jerror.obj: jerror.c
+
+$(OBJ_PATH)\jmemmgr.obj: jmemmgr.c
+
+$(OBJ_PATH)\jcapimin.obj: jcapimin.c
+
+$(OBJ_PATH)\jcapistd.obj: jcapistd.c
+
+$(OBJ_PATH)\jctrans.obj: jctrans.c
+
+$(OBJ_PATH)\jcparam.obj: jcparam.c
+
+$(OBJ_PATH)\jdatadst.obj: jdatadst.c
+
+$(OBJ_PATH)\jcinit.obj: jcinit.c
+
+$(OBJ_PATH)\jcmaster.obj: jcmaster.c
+
+$(OBJ_PATH)\jcmarker.obj: jcmarker.c
+
+$(OBJ_PATH)\jcmainct.obj: jcmainct.c
+
+$(OBJ_PATH)\jcprepct.obj: jcprepct.c
+
+$(OBJ_PATH)\jccoefct.obj: jccoefct.c
+
+$(OBJ_PATH)\jccolor.obj: jccolor.c
+
+$(OBJ_PATH)\jcsample.obj: jcsample.c
+
+$(OBJ_PATH)\jchuff.obj: jchuff.c
+
+$(OBJ_PATH)\jcphuff.obj: jcphuff.c
+
+$(OBJ_PATH)\jcdctmgr.obj: jcdctmgr.c
+
+$(OBJ_PATH)\jfdctfst.obj: jfdctfst.c
+
+$(OBJ_PATH)\jfdctflt.obj: jfdctflt.c
+
+$(OBJ_PATH)\jfdctint.obj: jfdctint.c
+
+$(OBJ_PATH)\jdapimin.obj: jdapimin.c
+
+$(OBJ_PATH)\jdapistd.obj: jdapistd.c
+
+$(OBJ_PATH)\jdtrans.obj: jdtrans.c
+
+$(OBJ_PATH)\jdatasrc.obj: jdatasrc.c
+
+$(OBJ_PATH)\jdmaster.obj: jdmaster.c
+
+$(OBJ_PATH)\jdinput.obj: jdinput.c
+
+$(OBJ_PATH)\jdmarker.obj: jdmarker.c
+
+$(OBJ_PATH)\jdhuff.obj: jdhuff.c
+
+$(OBJ_PATH)\jdphuff.obj: jdphuff.c
+
+$(OBJ_PATH)\jdmainct.obj: jdmainct.c
+
+$(OBJ_PATH)\jdcoefct.obj: jdcoefct.c
+
+$(OBJ_PATH)\jdpostct.obj: jdpostct.c
+
+$(OBJ_PATH)\jddctmgr.obj: jddctmgr.c
+
+$(OBJ_PATH)\jidctfst.obj: jidctfst.c
+
+$(OBJ_PATH)\jidctflt.obj: jidctflt.c
+
+$(OBJ_PATH)\jidctint.obj: jidctint.c
+
+$(OBJ_PATH)\jidctred.obj: jidctred.c
+
+$(OBJ_PATH)\jdsample.obj: jdsample.c
+
+$(OBJ_PATH)\jdcolor.obj: jdcolor.c
+
+$(OBJ_PATH)\jquant1.obj: jquant1.c
+
+$(OBJ_PATH)\jquant2.obj: jquant2.c
+
+$(OBJ_PATH)\jdmerge.obj: jdmerge.c
+
+
 
+!include ..\makelib.b32

diff --git a/src/makeb32.env b/src/makeb32.env
index 857e503f62b1d0c12d0f952719d09726ee99114a..b22614cde452e221c68836168c6a8179d7f5a187 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -4,24 +4,35 @@
 RM= erase
 !endif
 
+BORLAND_SUFFIX=bc
+DEBUG_SUFFIX=
+
 WXDIR = $(WXWIN)
-CFG = $(WXDIR)\src\msw\wxw32
+CFG = wxw32
 
+!ifndef OUTPUTDIR
+OBJ_PATH=$(WXDIR)\BORL
+OUTPUTDIR=$(WXDIR)\BORL
+!else
+OBJ_PATH=$(OUTPUTDIR)
+!endif
+
+!ifndef BCCDIR
 BCCDIR=$(MAKEDIR)\..
+!endif
 
 !if "$(BCCDIR)" == "\.."
 !error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4
 !endif
 
-ARCHINCDIR=$(WXDIR)\lib\msw
+ARCHINCDIR=$(WXDIR)\lib\$(BORLAND_SUFFIX)
 ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
 #see below for SETUPSRCDIR
 
-
-# Using a config file isn't compatible across all BC++ versions
-# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
+!ifndef WXLIBDIR
 WXLIBDIR = $(WXDIR)\lib
-WXLIBDIR2 = $(WXDIR)\contrib\lib
+!endif
+
 WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex;
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
@@ -61,6 +72,9 @@ LINKDEBUGFLAGS=/v
 
 !ifndef DLL
 DLL=0
+!else
+DLL=1
+WXMAKINGDLL=1
 !endif
 
 # Target             WXMAKINGDLL       WXUSINGDLL     WXBUILDDLL
@@ -77,18 +91,14 @@ DLL=0
 # options and all the obj files, and note that you must delete the obj files if you
 # change the options so that they are compiled using the correct ones.
 
-!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wx32
-!else
-WXLIBNAME=wx32
-!endif
+WXLIBNAME=wx25
+
 
 ## Use this if you want to use the UNIV controls set rather than the native ones 
 ## make -f makefile.b32 WXUSINGUNIV=1
 !if "$(WXUSINGUNIV)" == "1"
 USE_UNIV="UNIV"
-CFG=$(CFG)v
-WXLIBNAME=$(WXLIBNAME)v
+BORLAND_SUFFIX=$(BORLAND_SUFFIX)v
 ARCHINCDIR=$(ARCHINCDIR)v
 SETUPSRCDIR=$(WXDIR)\include\wx\univ
 PORT=__WXUNIVERSAL__
@@ -98,43 +108,35 @@ PORT=__WXMSW__
 SETUPSRCDIR=$(WXDIR)\include\wx\msw
 !endif
 
-#not sure what to do with unicode builds - we need to define something ?
-#!if "$(UNICODE)" == "1"
-#WXLIBNAME=$(WXLIBNAME)u
-#!endif
-
+#unicode builds handled inside setup.h
 
 #a hybrid , does not set __WXDEBUG__ but sets -v (see above)
 !if "$(FINAL)" == "hybrid"
-WXLIBNAME=$(WXLIBNAME)h
-CFG=$(CFG)h
+DEBUG_SUFFIX=$(DEBUG_SUFFIX)h
 !endif
 
 !if "$(FINAL)" == "0"
-WXLIBNAME=$(WXLIBNAME)d
-CFG=$(CFG)d
+DEBUG_SUFFIX=$(DEBUG_SUFFIX)d
 !endif
 
 !if "$(wxUSE_GUI)" == "0"
-WXLIBNAME=$(WXLIBNAME)b
-CFG=$(CFG)b
+BORLAND_SUFFIX=$(BORLAND_SUFFIX)b
 CPPFLAGS=-DwxUSE_GUI=0
 !endif
 
 !if "$(WXMAKINGDLL)" != "1" && "$(WXUSINGDLL)" != "1"
-WXLIBNAME=$(WXLIBNAME)s
+BORLAND_SUFFIX=$(BORLAND_SUFFIX)s
 !endif
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 INCEXT=dll$(INCEXT)
 !endif
 
-!ifndef WXLIBDIR
-WXLIBDIR=$(WXDIR)\lib
-!endif
-
-WXLIB=$(WXLIBDIR)\$(WXLIBNAME).lib
-WXDLL=$(WXLIBDIR)\$(WXLIBNAME).dll
+# final names determined here
+WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib
+WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll
+LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_$(DEBUG_SUFFIX).lib
+OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX)
 
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
@@ -152,7 +154,7 @@ DLL_FLAGS=
 LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif
 
-CFG=$(CFG).cfg
+CFG=$(OBJ_PATH)\$(CFG).cfg
 CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) @$(CFG) $(EXTRACPPFLAGS)
 
 DUMMY=dummy
@@ -163,7 +165,7 @@ OBJSUFF = obj
 WAITFLAG = /w
 
 .$(SRCSUFF).obj:
-    bcc32 $(CPPFLAGS) -c {$< }
+    bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< }
 
 .c.obj:
-    bcc32 $(CPPFLAGS) -P- -c {$< }
+    bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< }

diff --git a/src/makelib.b32 b/src/makelib.b32
index bcf9c9d994ec89b356e7a337a5f7f35373f4565f..2804b89c6eb9ee69f27bf87e52d0e12fec19f7c5 100644 (file)
--- a/src/makelib.b32
+++ b/src/makelib.b32
@@ -8,26 +8,25 @@
 # Include file for libraries. Set LIBTARGET and OBJECTS
 # before including this file.
 
-# WXWIN and BCCDIR are set by parent make
-
-WXDIR = $(WXWIN)
-
-!include $(WXDIR)\src\makeb32.env
 
 lib: $(LIBTARGET)
    
-$(LIBTARGET): $(OBJECTS)
-   -$(RM) $(LIBTARGET)
+$(LIBTARGET): $(OBJECTS) 
+   -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
+   echo making $(LIBTARGET)
    tlib "$(LIBTARGET)" /P512 @&&!
 +$(OBJECTS:.obj =.obj +)
 !
 
 clean:
-        -$(RM) *.obj
-        -$(RM) *.exe
-        -$(RM) *.res
-        -$(RM) *.map
-        -$(RM) *.rws
-        -$(RM) $(LIBTARGET)
+##        -if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj
+        -if exist *.res $(RM) *.res
+        -if exist *.map $(RM) *.map
+        -if exist *.rws $(RM) *.rws
+        -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
 
+.$(SRCSUFF).obj:
+    bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< }
 
+.c.obj:
+    bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< }

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index c3c7e7b7fbb07c223c68a41bfecf17664e517e01..0b06ef64954db865787767324baffbfec78a92f2 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,18 +13,23 @@
 # BCCDIR set in makeb32.env
 
 WXDIR = $(WXWIN)
+
+!ifndef EXEDIR
+EXEDIR = BORL
+!endif
+
 !include $(WXDIR)\src\makeb32.env
 
 !if "$(wxUSE_GUI)" == "0"
 IMGLIBS=
 !else
-IMGLIBS= winpng jpeg tiff
+IMGLIBS= png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX)
 !endif
 
 !if "$(WXUSINGDLL)" == "1"
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS) 
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS) 
 !else
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS)
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
 !endif
 
 !if "$(wxUSE_ODBC)" == "1"
@@ -42,12 +47,12 @@ LINKOUT = /aa
 
 !if "$(FINAL)" == "0"
 #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
-LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 #LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
-LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS =
 !endif
@@ -58,37 +63,49 @@ CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
 TARGETRES = 
 STARTUP = c0x32.obj    
 !else
-TARGETRES = $(TARGET).res
+TARGETRES = $(EXEDIR)\$(TARGET).res
 STARTUP = c0w32.obj
 !endif
 
-all: $(TARGET).exe $(EXTRATARGETS)
+EXE_TARGET=$(EXEDIR)\$(TARGET)
+
+default : all
+
+maked: 
+    -if not exist $(EXEDIR) mkdir $(EXEDIR)
 
-$(TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES)
-  $(LINK) $(LINKFLAGS) @&&!
+wx: $(EXE_TARGET).exe $(EXTRATARGETS)
+
+all: maked wx 
+
+
+$(EXE_TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES) 
+  $(LINK) $(LINKFLAGS) -j$(EXEDIR) @&&!
 $(STARTUP) $(OBJECTS)
-$(TARGET)
+$(EXE_TARGET)
 nul
 $(LIBS)
 $(TARGETDEF)
 $(TARGETRES)
 !
 
+.path.obj=$(EXEDIR)
+
 .$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) -c {$< }
+       bcc32 $(CPPFLAGS) -c -o$(EXEDIR)\$(<B).obj {$< }
 
 .c.obj:
-       bcc32 $(CPPFLAGS) -P- -c {$< }
+       bcc32 $(CPPFLAGS) -P- -c -o$(EXEDIR)\$(<B).obj {$< }
 
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(TARGET)
+$(TARGETRES) :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$(EXEDIR)\$(<B).res $(TARGET)
 
 clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-        -erase *.tds
-        -erase *.il?
+        -erase $(EXEDIR)\*.obj
+        -erase $(EXEDIR)\*.exe
+        -erase $(EXEDIR)\*.res
+        -erase $(EXEDIR)\*.map
+        -erase $(EXEDIR)\*.rws
+        -erase $(EXEDIR)\*.tds
+        -erase $(EXEDIR)\*.il?
 

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 6fe260580af741bbb5392977420217cfd7365268..73331036f255d5aac3dec300488fe209e2fb06a8 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -48,7 +48,6 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
-#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
 PERIPH_LIBS=
 PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
@@ -57,7 +56,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
+LIBS= cw32mti import32 ole2w32 odbc32 zlib_$(DEBUG_SUFFIX) png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) regex_$(DEBUG_SUFFIX)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -72,440 +71,440 @@ MSWDIR=.
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= $(MSWDIR)\busyinfo.obj \
-               $(MSWDIR)\calctrl.obj \
-               $(MSWDIR)\choicdgg.obj \
-               $(MSWDIR)\dcbuffer.obj \
-               $(MSWDIR)\dcpsg.obj \
-               $(MSWDIR)\dirctrlg.obj \
-               $(MSWDIR)\dragimgg.obj \
-               $(MSWDIR)\grid.obj \
-               $(MSWDIR)\gridctrl.obj \
-               $(MSWDIR)\gridsel.obj \
-               $(MSWDIR)\laywin.obj \
-               $(MSWDIR)\logg.obj \
-               $(MSWDIR)\numdlgg.obj \
-               $(MSWDIR)\panelg.obj \
-               $(MSWDIR)\progdlgg.obj \
-               $(MSWDIR)\sashwin.obj \
-               $(MSWDIR)\scrlwing.obj \
-               $(MSWDIR)\spinctlg.obj \
-               $(MSWDIR)\splash.obj \
-               $(MSWDIR)\splitter.obj \
-               $(MSWDIR)\statusbr.obj \
-               $(MSWDIR)\tbarsmpl.obj \
-               $(MSWDIR)\textdlgg.obj \
-               $(MSWDIR)\tipdlg.obj \
-               $(MSWDIR)\tipwin.obj \
-               $(MSWDIR)\treectlg.obj \
-               $(MSWDIR)\wizard.obj
-
-MSWOBJS = $(MSWDIR)\accel.obj \
-               $(MSWDIR)\access.obj \
-               $(MSWDIR)\app.obj \
-               $(MSWDIR)\automtn.obj \
-               $(MSWDIR)\bitmap.obj \
-               $(MSWDIR)\bmpbuttn.obj \
-               $(MSWDIR)\brush.obj \
-               $(MSWDIR)\button.obj \
-               $(MSWDIR)\caret.obj \
-               $(MSWDIR)\checkbox.obj \
-               $(MSWDIR)\checklst.obj \
-               $(MSWDIR)\choice.obj \
-               $(MSWDIR)\clipbrd.obj \
-               $(MSWDIR)\colordlg.obj \
-               $(MSWDIR)\colour.obj \
-               $(MSWDIR)\combobox.obj \
-               $(MSWDIR)\control.obj \
-               $(MSWDIR)\cursor.obj \
-               $(MSWDIR)\data.obj \
-               $(MSWDIR)\dataobj.obj \
-               $(MSWDIR)\dc.obj \
-               $(MSWDIR)\dcclient.obj \
-               $(MSWDIR)\dcmemory.obj \
-               $(MSWDIR)\dcprint.obj \
-               $(MSWDIR)\dcscreen.obj \
-               $(MSWDIR)\dde.obj \
-               $(MSWDIR)\dialog.obj \
-               $(MSWDIR)\dialup.obj \
-               $(MSWDIR)\dib.obj \
-               $(MSWDIR)\dir.obj \
-               $(MSWDIR)\dirdlg.obj \
-               $(MSWDIR)\display.obj \
-               $(MSWDIR)\dragimag.obj \
-               $(MSWDIR)\dropsrc.obj \
-               $(MSWDIR)\droptgt.obj \
-               $(MSWDIR)\enhmeta.obj \
-               $(MSWDIR)\evtloop.obj \
-               $(MSWDIR)\fdrepdlg.obj \
-               $(MSWDIR)\filedlg.obj \
-               $(MSWDIR)\font.obj \
-               $(MSWDIR)\fontdlg.obj \
-               $(MSWDIR)\fontenum.obj \
-               $(MSWDIR)\fontutil.obj \
-               $(MSWDIR)\frame.obj \
-               $(MSWDIR)\gauge95.obj \
-               $(MSWDIR)\gdiimage.obj \
-               $(MSWDIR)\gdiobj.obj \
-               $(MSWDIR)\glcanvas.obj \
-               $(MSWDIR)\gsocket.obj \
-               $(MSWDIR)\gsockmsw.obj \
-               $(MSWDIR)\helpbest.obj \
-               $(MSWDIR)\helpchm.obj \
-               $(MSWDIR)\helpwin.obj \
-               $(MSWDIR)\icon.obj \
-               $(MSWDIR)\imaglist.obj \
-               $(MSWDIR)\iniconf.obj \
-               $(MSWDIR)\joystick.obj \
-               $(MSWDIR)\listbox.obj \
-               $(MSWDIR)\listctrl.obj \
-               $(MSWDIR)\main.obj \
-               $(MSWDIR)\mdi.obj \
-               $(MSWDIR)\menu.obj \
-               $(MSWDIR)\menuitem.obj \
-               $(MSWDIR)\metafile.obj \
-               $(MSWDIR)\mimetype.obj \
-               $(MSWDIR)\minifram.obj \
-               $(MSWDIR)\msgdlg.obj \
-               $(MSWDIR)\mslu.obj \
-               $(MSWDIR)\nativdlg.obj \
-               $(MSWDIR)\notebook.obj \
-               $(MSWDIR)\oleutils.obj \
-               $(MSWDIR)\ownerdrw.obj \
-               $(MSWDIR)\palette.obj \
-               $(MSWDIR)\pen.obj \
-               $(MSWDIR)\penwin.obj \
-               $(MSWDIR)\popupwin.obj \
-               $(MSWDIR)\printdlg.obj \
-               $(MSWDIR)\printwin.obj \
-               $(MSWDIR)\radiobox.obj \
-               $(MSWDIR)\radiobut.obj \
-               $(MSWDIR)\regconf.obj \
-               $(MSWDIR)\region.obj \
-               $(MSWDIR)\registry.obj \
-               $(MSWDIR)\scrolbar.obj \
-               $(MSWDIR)\settings.obj \
-               $(MSWDIR)\slider95.obj \
-               $(MSWDIR)\snglinst.obj \
-               $(MSWDIR)\spinbutt.obj \
-               $(MSWDIR)\spinctrl.obj \
-               $(MSWDIR)\statbmp.obj \
-               $(MSWDIR)\statbox.obj \
-               $(MSWDIR)\statbr95.obj \
-               $(MSWDIR)\statline.obj \
-               $(MSWDIR)\stattext.obj \
-               $(MSWDIR)\tabctrl.obj \
-               $(MSWDIR)\taskbar.obj \
-               $(MSWDIR)\tbar95.obj \
-               $(MSWDIR)\textctrl.obj \
-               $(MSWDIR)\tglbtn.obj \
-               $(MSWDIR)\thread.obj \
-               $(MSWDIR)\timer.obj \
-               $(MSWDIR)\tooltip.obj \
-               $(MSWDIR)\toplevel.obj \
-               $(MSWDIR)\treectrl.obj \
-               $(MSWDIR)\utils.obj \
-               $(MSWDIR)\utilsexc.obj \
-               $(MSWDIR)\uuid.obj \
-               $(MSWDIR)\volume.obj \
-               $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj
-
-GENERICUNIVOBJS= $(MSWDIR)\accel.obj \
-               $(MSWDIR)\busyinfo.obj \
-               $(MSWDIR)\calctrl.obj \
-               $(MSWDIR)\choicdgg.obj \
-               $(MSWDIR)\colrdlgg.obj \
-               $(MSWDIR)\dcbuffer.obj \
-               $(MSWDIR)\dcpsg.obj \
-               $(MSWDIR)\dirctrlg.obj \
-               $(MSWDIR)\dragimgg.obj \
-               $(MSWDIR)\fdrepdlg.obj \
-               $(MSWDIR)\filedlgg.obj \
-               $(MSWDIR)\fontdlgg.obj \
-               $(MSWDIR)\grid.obj \
-               $(MSWDIR)\gridctrl.obj \
-               $(MSWDIR)\gridsel.obj \
-               $(MSWDIR)\helpext.obj \
-               $(MSWDIR)\imaglist.obj \
-               $(MSWDIR)\laywin.obj \
-               $(MSWDIR)\listctrl.obj \
-               $(MSWDIR)\logg.obj \
-               $(MSWDIR)\mdig.obj \
-               $(MSWDIR)\msgdlgg.obj \
-               $(MSWDIR)\numdlgg.obj \
-               $(MSWDIR)\panelg.obj \
-               $(MSWDIR)\printps.obj \
-               $(MSWDIR)\prntdlgg.obj \
-               $(MSWDIR)\progdlgg.obj \
-               $(MSWDIR)\sashwin.obj \
-               $(MSWDIR)\scrlwing.obj \
-               $(MSWDIR)\spinctlg.obj \
-               $(MSWDIR)\splash.obj \
-               $(MSWDIR)\splitter.obj \
-               $(MSWDIR)\tabg.obj \
-               $(MSWDIR)\tbarsmpl.obj \
-               $(MSWDIR)\textdlgg.obj \
-               $(MSWDIR)\tipdlg.obj \
-               $(MSWDIR)\tipwin.obj \
-               $(MSWDIR)\treectlg.obj \
-               $(MSWDIR)\wizard.obj
-
-MSWUNIVOBJS = $(MSWDIR)\app.obj \
-               $(MSWDIR)\automtn.obj \
-               $(MSWDIR)\bitmap.obj \
-               $(MSWDIR)\brush.obj \
-               $(MSWDIR)\caret.obj \
-               $(MSWDIR)\clipbrd.obj \
-               $(MSWDIR)\colour.obj \
-               $(MSWDIR)\cursor.obj \
-               $(MSWDIR)\data.obj \
-               $(MSWDIR)\dataobj.obj \
-               $(MSWDIR)\dc.obj \
-               $(MSWDIR)\dcclient.obj \
-               $(MSWDIR)\dcmemory.obj \
-               $(MSWDIR)\dcprint.obj \
-               $(MSWDIR)\dcscreen.obj \
-               $(MSWDIR)\dde.obj \
-               $(MSWDIR)\dialup.obj \
-               $(MSWDIR)\dib.obj \
-               $(MSWDIR)\dir.obj \
-               $(MSWDIR)\dirdlg.obj \
-               $(MSWDIR)\display.obj \
-               $(MSWDIR)\dropsrc.obj \
-               $(MSWDIR)\droptgt.obj \
-               $(MSWDIR)\enhmeta.obj \
-               $(MSWDIR)\evtloop.obj \
-               $(MSWDIR)\font.obj \
-               $(MSWDIR)\fontenum.obj \
-               $(MSWDIR)\fontutil.obj \
-               $(MSWDIR)\gdiimage.obj \
-               $(MSWDIR)\gdiobj.obj \
-               $(MSWDIR)\glcanvas.obj \
-               $(MSWDIR)\gsocket.obj \
-               $(MSWDIR)\gsockmsw.obj \
-               $(MSWDIR)\helpbest.obj \
-               $(MSWDIR)\helpchm.obj \
-               $(MSWDIR)\helpwin.obj \
-               $(MSWDIR)\icon.obj \
-               $(MSWDIR)\joystick.obj \
-               $(MSWDIR)\main.obj \
-               $(MSWDIR)\mimetype.obj \
-               $(MSWDIR)\minifram.obj \
-               $(MSWDIR)\oleutils.obj \
-               $(MSWDIR)\palette.obj \
-               $(MSWDIR)\pen.obj \
-               $(MSWDIR)\popupwin.obj \
-               $(MSWDIR)\regconf.obj \
-               $(MSWDIR)\region.obj \
-               $(MSWDIR)\registry.obj \
-               $(MSWDIR)\settings.obj \
-               $(MSWDIR)\snglinst.obj \
-               $(MSWDIR)\taskbar.obj \
-               $(MSWDIR)\thread.obj \
-               $(MSWDIR)\timer.obj \
-               $(MSWDIR)\tooltip.obj \
-               $(MSWDIR)\toplevel.obj \
-               $(MSWDIR)\utils.obj \
-               $(MSWDIR)\utilsexc.obj \
-               $(MSWDIR)\uuid.obj \
-               $(MSWDIR)\volume.obj \
-               $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj
-
-UNIVOBJS = $(MSWDIR)\bmpbuttn.obj \
-               $(MSWDIR)\button.obj \
-               $(MSWDIR)\checkbox.obj \
-               $(MSWDIR)\checklst.obj \
-               $(MSWDIR)\choice.obj \
-               $(MSWDIR)\colschem.obj \
-               $(MSWDIR)\combobox.obj \
-               $(MSWDIR)\control.obj \
-               $(MSWDIR)\dialog.obj \
-               $(MSWDIR)\framuniv.obj \
-               $(MSWDIR)\gauge.obj \
-               $(MSWDIR)\inpcons.obj \
-               $(MSWDIR)\inphand.obj \
-               $(MSWDIR)\listbox.obj \
-               $(MSWDIR)\menu.obj \
-               $(MSWDIR)\notebook.obj \
-               $(MSWDIR)\radiobox.obj \
-               $(MSWDIR)\radiobut.obj \
-               $(MSWDIR)\renderer.obj \
-               $(MSWDIR)\scrarrow.obj \
-               $(MSWDIR)\scrolbar.obj \
-               $(MSWDIR)\scrthumb.obj \
-               $(MSWDIR)\slider.obj \
-               $(MSWDIR)\spinbutt.obj \
-               $(MSWDIR)\statbmp.obj \
-               $(MSWDIR)\statbox.obj \
-               $(MSWDIR)\statline.obj \
-               $(MSWDIR)\stattext.obj \
-               $(MSWDIR)\statusbr.obj \
-               $(MSWDIR)\textctrl.obj \
-               $(MSWDIR)\theme.obj \
-               $(MSWDIR)\toolbar.obj \
-               $(MSWDIR)\topluniv.obj \
-               $(MSWDIR)\winuniv.obj
-
-UNIVTHEMEOBJS = $(MSWDIR)\gtk.obj \
-               $(MSWDIR)\metal.obj \
-               $(MSWDIR)\win32.obj
-
-HTMLOBJS = $(MSWDIR)\helpctrl.obj \
-               $(MSWDIR)\helpdata.obj \
-               $(MSWDIR)\helpfrm.obj \
-               $(MSWDIR)\htmlcell.obj \
-               $(MSWDIR)\htmlfilt.obj \
-               $(MSWDIR)\htmlpars.obj \
-               $(MSWDIR)\htmltag.obj \
-               $(MSWDIR)\htmlwin.obj \
-               $(MSWDIR)\htmprint.obj \
-               $(MSWDIR)\m_dflist.obj \
-               $(MSWDIR)\m_fonts.obj \
-               $(MSWDIR)\m_hline.obj \
-               $(MSWDIR)\m_image.obj \
-               $(MSWDIR)\m_layout.obj \
-               $(MSWDIR)\m_links.obj \
-               $(MSWDIR)\m_list.obj \
-               $(MSWDIR)\m_pre.obj \
-               $(MSWDIR)\m_style.obj \
-               $(MSWDIR)\m_tables.obj \
-               $(MSWDIR)\winpars.obj
+GENERICOBJS= $(OBJ_PATH)\busyinfo.obj \
+               $(OBJ_PATH)\calctrl.obj \
+               $(OBJ_PATH)\choicdgg.obj \
+               $(OBJ_PATH)\dcbuffer.obj \
+               $(OBJ_PATH)\dcpsg.obj \
+               $(OBJ_PATH)\dirctrlg.obj \
+               $(OBJ_PATH)\dragimgg.obj \
+               $(OBJ_PATH)\grid.obj \
+               $(OBJ_PATH)\gridctrl.obj \
+               $(OBJ_PATH)\gridsel.obj \
+               $(OBJ_PATH)\laywin.obj \
+               $(OBJ_PATH)\logg.obj \
+               $(OBJ_PATH)\numdlgg.obj \
+               $(OBJ_PATH)\panelg.obj \
+               $(OBJ_PATH)\progdlgg.obj \
+               $(OBJ_PATH)\sashwin.obj \
+               $(OBJ_PATH)\scrlwing.obj \
+               $(OBJ_PATH)\spinctlg.obj \
+               $(OBJ_PATH)\splash.obj \
+               $(OBJ_PATH)\splitter.obj \
+               $(OBJ_PATH)\statusbr.obj \
+               $(OBJ_PATH)\tbarsmpl.obj \
+               $(OBJ_PATH)\textdlgg.obj \
+               $(OBJ_PATH)\tipdlg.obj \
+               $(OBJ_PATH)\tipwin.obj \
+               $(OBJ_PATH)\treectlg.obj \
+               $(OBJ_PATH)\wizard.obj
+
+MSWOBJS = $(OBJ_PATH)\accel.obj \
+               $(OBJ_PATH)\access.obj \
+               $(OBJ_PATH)\app.obj \
+               $(OBJ_PATH)\automtn.obj \
+               $(OBJ_PATH)\bitmap.obj \
+               $(OBJ_PATH)\bmpbuttn.obj \
+               $(OBJ_PATH)\brush.obj \
+               $(OBJ_PATH)\button.obj \
+               $(OBJ_PATH)\caret.obj \
+               $(OBJ_PATH)\checkbox.obj \
+               $(OBJ_PATH)\checklst.obj \
+               $(OBJ_PATH)\choice.obj \
+               $(OBJ_PATH)\clipbrd.obj \
+               $(OBJ_PATH)\colordlg.obj \
+               $(OBJ_PATH)\colour.obj \
+               $(OBJ_PATH)\combobox.obj \
+               $(OBJ_PATH)\control.obj \
+               $(OBJ_PATH)\cursor.obj \
+               $(OBJ_PATH)\data.obj \
+               $(OBJ_PATH)\dataobj.obj \
+               $(OBJ_PATH)\dc.obj \
+               $(OBJ_PATH)\dcclient.obj \
+               $(OBJ_PATH)\dcmemory.obj \
+               $(OBJ_PATH)\dcprint.obj \
+               $(OBJ_PATH)\dcscreen.obj \
+               $(OBJ_PATH)\dde.obj \
+               $(OBJ_PATH)\dialog.obj \
+               $(OBJ_PATH)\dialup.obj \
+               $(OBJ_PATH)\dib.obj \
+               $(OBJ_PATH)\dir.obj \
+               $(OBJ_PATH)\dirdlg.obj \
+               $(OBJ_PATH)\display.obj \
+               $(OBJ_PATH)\dragimag.obj \
+               $(OBJ_PATH)\dropsrc.obj \
+               $(OBJ_PATH)\droptgt.obj \
+               $(OBJ_PATH)\enhmeta.obj \
+               $(OBJ_PATH)\evtloop.obj \
+               $(OBJ_PATH)\fdrepdlg.obj \
+               $(OBJ_PATH)\filedlg.obj \
+               $(OBJ_PATH)\font.obj \
+               $(OBJ_PATH)\fontdlg.obj \
+               $(OBJ_PATH)\fontenum.obj \
+               $(OBJ_PATH)\fontutil.obj \
+               $(OBJ_PATH)\frame.obj \
+               $(OBJ_PATH)\gauge95.obj \
+               $(OBJ_PATH)\gdiimage.obj \
+               $(OBJ_PATH)\gdiobj.obj \
+               $(OBJ_PATH)\glcanvas.obj \
+               $(OBJ_PATH)\gsocket.obj \
+               $(OBJ_PATH)\gsockmsw.obj \
+               $(OBJ_PATH)\helpbest.obj \
+               $(OBJ_PATH)\helpchm.obj \
+               $(OBJ_PATH)\helpwin.obj \
+               $(OBJ_PATH)\icon.obj \
+               $(OBJ_PATH)\imaglist.obj \
+               $(OBJ_PATH)\iniconf.obj \
+               $(OBJ_PATH)\joystick.obj \
+               $(OBJ_PATH)\listbox.obj \
+               $(OBJ_PATH)\listctrl.obj \
+               $(OBJ_PATH)\main.obj \
+               $(OBJ_PATH)\mdi.obj \
+               $(OBJ_PATH)\menu.obj \
+               $(OBJ_PATH)\menuitem.obj \
+               $(OBJ_PATH)\metafile.obj \
+               $(OBJ_PATH)\mimetype.obj \
+               $(OBJ_PATH)\minifram.obj \
+               $(OBJ_PATH)\msgdlg.obj \
+               $(OBJ_PATH)\mslu.obj \
+               $(OBJ_PATH)\nativdlg.obj \
+               $(OBJ_PATH)\notebook.obj \
+               $(OBJ_PATH)\oleutils.obj \
+               $(OBJ_PATH)\ownerdrw.obj \
+               $(OBJ_PATH)\palette.obj \
+               $(OBJ_PATH)\pen.obj \
+               $(OBJ_PATH)\penwin.obj \
+               $(OBJ_PATH)\popupwin.obj \
+               $(OBJ_PATH)\printdlg.obj \
+               $(OBJ_PATH)\printwin.obj \
+               $(OBJ_PATH)\radiobox.obj \
+               $(OBJ_PATH)\radiobut.obj \
+               $(OBJ_PATH)\regconf.obj \
+               $(OBJ_PATH)\region.obj \
+               $(OBJ_PATH)\registry.obj \
+               $(OBJ_PATH)\scrolbar.obj \
+               $(OBJ_PATH)\settings.obj \
+               $(OBJ_PATH)\slider95.obj \
+               $(OBJ_PATH)\snglinst.obj \
+               $(OBJ_PATH)\spinbutt.obj \
+               $(OBJ_PATH)\spinctrl.obj \
+               $(OBJ_PATH)\statbmp.obj \
+               $(OBJ_PATH)\statbox.obj \
+               $(OBJ_PATH)\statbr95.obj \
+               $(OBJ_PATH)\statline.obj \
+               $(OBJ_PATH)\stattext.obj \
+               $(OBJ_PATH)\tabctrl.obj \
+               $(OBJ_PATH)\taskbar.obj \
+               $(OBJ_PATH)\tbar95.obj \
+               $(OBJ_PATH)\textctrl.obj \
+               $(OBJ_PATH)\tglbtn.obj \
+               $(OBJ_PATH)\thread.obj \
+               $(OBJ_PATH)\timer.obj \
+               $(OBJ_PATH)\tooltip.obj \
+               $(OBJ_PATH)\toplevel.obj \
+               $(OBJ_PATH)\treectrl.obj \
+               $(OBJ_PATH)\utils.obj \
+               $(OBJ_PATH)\utilsexc.obj \
+               $(OBJ_PATH)\uuid.obj \
+               $(OBJ_PATH)\volume.obj \
+               $(OBJ_PATH)\wave.obj \
+               $(OBJ_PATH)\window.obj
+
+GENERICUNIVOBJS= $(OBJ_PATH)\accel.obj \
+               $(OBJ_PATH)\busyinfo.obj \
+               $(OBJ_PATH)\calctrl.obj \
+               $(OBJ_PATH)\choicdgg.obj \
+               $(OBJ_PATH)\colrdlgg.obj \
+               $(OBJ_PATH)\dcbuffer.obj \
+               $(OBJ_PATH)\dcpsg.obj \
+               $(OBJ_PATH)\dirctrlg.obj \
+               $(OBJ_PATH)\dragimgg.obj \
+               $(OBJ_PATH)\fdrepdlg.obj \
+               $(OBJ_PATH)\filedlgg.obj \
+               $(OBJ_PATH)\fontdlgg.obj \
+               $(OBJ_PATH)\grid.obj \
+               $(OBJ_PATH)\gridctrl.obj \
+               $(OBJ_PATH)\gridsel.obj \
+               $(OBJ_PATH)\helpext.obj \
+               $(OBJ_PATH)\imaglist.obj \
+               $(OBJ_PATH)\laywin.obj \
+               $(OBJ_PATH)\listctrl.obj \
+               $(OBJ_PATH)\logg.obj \
+               $(OBJ_PATH)\mdig.obj \
+               $(OBJ_PATH)\msgdlgg.obj \
+               $(OBJ_PATH)\numdlgg.obj \
+               $(OBJ_PATH)\panelg.obj \
+               $(OBJ_PATH)\printps.obj \
+               $(OBJ_PATH)\prntdlgg.obj \
+               $(OBJ_PATH)\progdlgg.obj \
+               $(OBJ_PATH)\sashwin.obj \
+               $(OBJ_PATH)\scrlwing.obj \
+               $(OBJ_PATH)\spinctlg.obj \
+               $(OBJ_PATH)\splash.obj \
+               $(OBJ_PATH)\splitter.obj \
+               $(OBJ_PATH)\tabg.obj \
+               $(OBJ_PATH)\tbarsmpl.obj \
+               $(OBJ_PATH)\textdlgg.obj \
+               $(OBJ_PATH)\tipdlg.obj \
+               $(OBJ_PATH)\tipwin.obj \
+               $(OBJ_PATH)\treectlg.obj \
+               $(OBJ_PATH)\wizard.obj
+
+MSWUNIVOBJS = $(OBJ_PATH)\app.obj \
+               $(OBJ_PATH)\automtn.obj \
+               $(OBJ_PATH)\bitmap.obj \
+               $(OBJ_PATH)\brush.obj \
+               $(OBJ_PATH)\caret.obj \
+               $(OBJ_PATH)\clipbrd.obj \
+               $(OBJ_PATH)\colour.obj \
+               $(OBJ_PATH)\cursor.obj \
+               $(OBJ_PATH)\data.obj \
+               $(OBJ_PATH)\dataobj.obj \
+               $(OBJ_PATH)\dc.obj \
+               $(OBJ_PATH)\dcclient.obj \
+               $(OBJ_PATH)\dcmemory.obj \
+               $(OBJ_PATH)\dcprint.obj \
+               $(OBJ_PATH)\dcscreen.obj \
+               $(OBJ_PATH)\dde.obj \
+               $(OBJ_PATH)\dialup.obj \
+               $(OBJ_PATH)\dib.obj \
+               $(OBJ_PATH)\dir.obj \
+               $(OBJ_PATH)\dirdlg.obj \
+               $(OBJ_PATH)\display.obj \
+               $(OBJ_PATH)\dropsrc.obj \
+               $(OBJ_PATH)\droptgt.obj \
+               $(OBJ_PATH)\enhmeta.obj \
+               $(OBJ_PATH)\evtloop.obj \
+               $(OBJ_PATH)\font.obj \
+               $(OBJ_PATH)\fontenum.obj \
+               $(OBJ_PATH)\fontutil.obj \
+               $(OBJ_PATH)\gdiimage.obj \
+               $(OBJ_PATH)\gdiobj.obj \
+               $(OBJ_PATH)\glcanvas.obj \
+               $(OBJ_PATH)\gsocket.obj \
+               $(OBJ_PATH)\gsockmsw.obj \
+               $(OBJ_PATH)\helpbest.obj \
+               $(OBJ_PATH)\helpchm.obj \
+               $(OBJ_PATH)\helpwin.obj \
+               $(OBJ_PATH)\icon.obj \
+               $(OBJ_PATH)\joystick.obj \
+               $(OBJ_PATH)\main.obj \
+               $(OBJ_PATH)\mimetype.obj \
+               $(OBJ_PATH)\minifram.obj \
+               $(OBJ_PATH)\oleutils.obj \
+               $(OBJ_PATH)\palette.obj \
+               $(OBJ_PATH)\pen.obj \
+               $(OBJ_PATH)\popupwin.obj \
+               $(OBJ_PATH)\regconf.obj \
+               $(OBJ_PATH)\region.obj \
+               $(OBJ_PATH)\registry.obj \
+               $(OBJ_PATH)\settings.obj \
+               $(OBJ_PATH)\snglinst.obj \
+               $(OBJ_PATH)\taskbar.obj \
+               $(OBJ_PATH)\thread.obj \
+               $(OBJ_PATH)\timer.obj \
+               $(OBJ_PATH)\tooltip.obj \
+               $(OBJ_PATH)\toplevel.obj \
+               $(OBJ_PATH)\utils.obj \
+               $(OBJ_PATH)\utilsexc.obj \
+               $(OBJ_PATH)\uuid.obj \
+               $(OBJ_PATH)\volume.obj \
+               $(OBJ_PATH)\wave.obj \
+               $(OBJ_PATH)\window.obj
+
+UNIVOBJS = $(OBJ_PATH)\bmpbuttn.obj \
+               $(OBJ_PATH)\button.obj \
+               $(OBJ_PATH)\checkbox.obj \
+               $(OBJ_PATH)\checklst.obj \
+               $(OBJ_PATH)\choice.obj \
+               $(OBJ_PATH)\colschem.obj \
+               $(OBJ_PATH)\combobox.obj \
+               $(OBJ_PATH)\control.obj \
+               $(OBJ_PATH)\dialog.obj \
+               $(OBJ_PATH)\framuniv.obj \
+               $(OBJ_PATH)\gauge.obj \
+               $(OBJ_PATH)\inpcons.obj \
+               $(OBJ_PATH)\inphand.obj \
+               $(OBJ_PATH)\listbox.obj \
+               $(OBJ_PATH)\menu.obj \
+               $(OBJ_PATH)\notebook.obj \
+               $(OBJ_PATH)\radiobox.obj \
+               $(OBJ_PATH)\radiobut.obj \
+               $(OBJ_PATH)\renderer.obj \
+               $(OBJ_PATH)\scrarrow.obj \
+               $(OBJ_PATH)\scrolbar.obj \
+               $(OBJ_PATH)\scrthumb.obj \
+               $(OBJ_PATH)\slider.obj \
+               $(OBJ_PATH)\spinbutt.obj \
+               $(OBJ_PATH)\statbmp.obj \
+               $(OBJ_PATH)\statbox.obj \
+               $(OBJ_PATH)\statline.obj \
+               $(OBJ_PATH)\stattext.obj \
+               $(OBJ_PATH)\statusbr.obj \
+               $(OBJ_PATH)\textctrl.obj \
+               $(OBJ_PATH)\theme.obj \
+               $(OBJ_PATH)\toolbar.obj \
+               $(OBJ_PATH)\topluniv.obj \
+               $(OBJ_PATH)\winuniv.obj
+
+UNIVTHEMEOBJS = $(OBJ_PATH)\gtk.obj \
+               $(OBJ_PATH)\metal.obj \
+               $(OBJ_PATH)\win32.obj
+
+HTMLOBJS = $(OBJ_PATH)\helpctrl.obj \
+               $(OBJ_PATH)\helpdata.obj \
+               $(OBJ_PATH)\helpfrm.obj \
+               $(OBJ_PATH)\htmlcell.obj \
+               $(OBJ_PATH)\htmlfilt.obj \
+               $(OBJ_PATH)\htmlpars.obj \
+               $(OBJ_PATH)\htmltag.obj \
+               $(OBJ_PATH)\htmlwin.obj \
+               $(OBJ_PATH)\htmprint.obj \
+               $(OBJ_PATH)\m_dflist.obj \
+               $(OBJ_PATH)\m_fonts.obj \
+               $(OBJ_PATH)\m_hline.obj \
+               $(OBJ_PATH)\m_image.obj \
+               $(OBJ_PATH)\m_layout.obj \
+               $(OBJ_PATH)\m_links.obj \
+               $(OBJ_PATH)\m_list.obj \
+               $(OBJ_PATH)\m_pre.obj \
+               $(OBJ_PATH)\m_style.obj \
+               $(OBJ_PATH)\m_tables.obj \
+               $(OBJ_PATH)\winpars.obj
 
 COMMONOBJS = \
-        $(MSWDIR)\accesscmn.obj \
-               $(MSWDIR)\appcmn.obj \
-               $(MSWDIR)\artprov.obj \
-               $(MSWDIR)\artstd.obj \
-               $(MSWDIR)\choiccmn.obj \
-               $(MSWDIR)\clipcmn.obj \
-               $(MSWDIR)\clntdata.obj \
-               $(MSWDIR)\cmdline.obj \
-               $(MSWDIR)\cmdproc.obj \
-               $(MSWDIR)\cmndata.obj \
-               $(MSWDIR)\config.obj \
-               $(MSWDIR)\containr.obj \
-               $(MSWDIR)\cshelp.obj \
-               $(MSWDIR)\ctrlcmn.obj \
-               $(MSWDIR)\ctrlsub.obj \
-               $(MSWDIR)\datacmn.obj \
-               $(MSWDIR)\datetime.obj \
-               $(MSWDIR)\datstrm.obj \
-               $(MSWDIR)\db.obj \
-               $(MSWDIR)\dbgrid.obj \
-               $(MSWDIR)\dbtable.obj \
-               $(MSWDIR)\dcbase.obj \
-               $(MSWDIR)\dircmn.obj \
-               $(MSWDIR)\dlgcmn.obj \
-               $(MSWDIR)\dndcmn.obj \
-               $(MSWDIR)\dobjcmn.obj \
-               $(MSWDIR)\docmdi.obj \
-               $(MSWDIR)\docview.obj \
-               $(MSWDIR)\dpycmn.obj \
-               $(MSWDIR)\dseldlg.obj \
-               $(MSWDIR)\dynarray.obj \
-               $(MSWDIR)\dynlib.obj \
-               $(MSWDIR)\dynload.obj \
-               $(MSWDIR)\effects.obj \
-               $(MSWDIR)\encconv.obj \
-               $(MSWDIR)\event.obj \
-               $(MSWDIR)\extended.obj \
-               $(MSWDIR)\fddlgcmn.obj \
-               $(MSWDIR)\ffile.obj \
-               $(MSWDIR)\file.obj \
-               $(MSWDIR)\fileconf.obj \
-               $(MSWDIR)\filefn.obj \
-               $(MSWDIR)\filename.obj \
-               $(MSWDIR)\filesys.obj \
-               $(MSWDIR)\fontcmn.obj \
-               $(MSWDIR)\fontmap.obj \
-               $(MSWDIR)\framecmn.obj \
-               $(MSWDIR)\fs_inet.obj \
-               $(MSWDIR)\fs_mem.obj \
-               $(MSWDIR)\fs_zip.obj \
-               $(MSWDIR)\ftp.obj \
-               $(MSWDIR)\gaugecmn.obj \
-               $(MSWDIR)\gdicmn.obj \
-               $(MSWDIR)\geometry.obj \
-               $(MSWDIR)\gifdecod.obj \
-               $(MSWDIR)\hash.obj \
-               $(MSWDIR)\hashmap.obj \
-               $(MSWDIR)\helpbase.obj \
-               $(MSWDIR)\http.obj \
-               $(MSWDIR)\iconbndl.obj \
-               $(MSWDIR)\imagall.obj \
-               $(MSWDIR)\imagbmp.obj \
-               $(MSWDIR)\image.obj \
-               $(MSWDIR)\imagfill.obj \
-               $(MSWDIR)\imaggif.obj \
-               $(MSWDIR)\imagiff.obj \
-               $(MSWDIR)\imagjpeg.obj \
-               $(MSWDIR)\imagpcx.obj \
-               $(MSWDIR)\imagpng.obj \
-               $(MSWDIR)\imagpnm.obj \
-               $(MSWDIR)\imagtiff.obj \
-               $(MSWDIR)\imagxpm.obj \
-               $(MSWDIR)\intl.obj \
-               $(MSWDIR)\ipcbase.obj \
-               $(MSWDIR)\layout.obj \
-               $(MSWDIR)\lboxcmn.obj \
-               $(MSWDIR)\list.obj \
-               $(MSWDIR)\log.obj \
-               $(MSWDIR)\longlong.obj \
-               $(MSWDIR)\matrix.obj \
-               $(MSWDIR)\memory.obj \
-               $(MSWDIR)\menucmn.obj \
-               $(MSWDIR)\mimecmn.obj \
-               $(MSWDIR)\module.obj \
-               $(MSWDIR)\msgout.obj \
-               $(MSWDIR)\mstream.obj \
-               $(MSWDIR)\nbkbase.obj \
-               $(MSWDIR)\object.obj \
-               $(MSWDIR)\paper.obj \
-               $(MSWDIR)\popupcmn.obj \
-               $(MSWDIR)\prntbase.obj \
-               $(MSWDIR)\process.obj \
-               $(MSWDIR)\protocol.obj \
-               $(MSWDIR)\quantize.obj \
-               $(MSWDIR)\radiocmn.obj \
-               $(MSWDIR)\regex.obj \
-               $(MSWDIR)\rgncmn.obj \
-               $(MSWDIR)\sckaddr.obj \
-               $(MSWDIR)\sckfile.obj \
-               $(MSWDIR)\sckipc.obj \
-               $(MSWDIR)\sckstrm.obj \
-               $(MSWDIR)\settcmn.obj \
-               $(MSWDIR)\sizer.obj \
-               $(MSWDIR)\socket.obj \
-               $(MSWDIR)\statbar.obj \
-               $(MSWDIR)\strconv.obj \
-               $(MSWDIR)\stream.obj \
-               $(MSWDIR)\string.obj \
-               $(MSWDIR)\sysopt.obj \
-               $(MSWDIR)\taskbarcmn.obj \
-               $(MSWDIR)\tbarbase.obj \
-               $(MSWDIR)\textbuf.obj \
-               $(MSWDIR)\textcmn.obj \
-               $(MSWDIR)\textfile.obj \
-               $(MSWDIR)\timercmn.obj \
-               $(MSWDIR)\tokenzr.obj \
-               $(MSWDIR)\toplvcmn.obj \
-               $(MSWDIR)\treebase.obj \
-               $(MSWDIR)\txtstrm.obj \
-               $(MSWDIR)\unzip.obj \
-               $(MSWDIR)\url.obj \
-               $(MSWDIR)\utilscmn.obj \
-               $(MSWDIR)\valgen.obj \
-               $(MSWDIR)\validate.obj \
-               $(MSWDIR)\valtext.obj \
-               $(MSWDIR)\variant.obj \
-               $(MSWDIR)\wfstream.obj \
-               $(MSWDIR)\wincmn.obj \
-               $(MSWDIR)\wxchar.obj \
-               $(MSWDIR)\xpmdecod.obj \
-               $(MSWDIR)\zipstrm.obj \
-               $(MSWDIR)\zstream.obj
+        $(OBJ_PATH)\accesscmn.obj \
+               $(OBJ_PATH)\appcmn.obj \
+               $(OBJ_PATH)\artprov.obj \
+               $(OBJ_PATH)\artstd.obj \
+               $(OBJ_PATH)\choiccmn.obj \
+               $(OBJ_PATH)\clipcmn.obj \
+               $(OBJ_PATH)\clntdata.obj \
+               $(OBJ_PATH)\cmdline.obj \
+               $(OBJ_PATH)\cmdproc.obj \
+               $(OBJ_PATH)\cmndata.obj \
+               $(OBJ_PATH)\config.obj \
+               $(OBJ_PATH)\containr.obj \
+               $(OBJ_PATH)\cshelp.obj \
+               $(OBJ_PATH)\ctrlcmn.obj \
+               $(OBJ_PATH)\ctrlsub.obj \
+               $(OBJ_PATH)\datacmn.obj \
+               $(OBJ_PATH)\datetime.obj \
+               $(OBJ_PATH)\datstrm.obj \
+               $(OBJ_PATH)\db.obj \
+               $(OBJ_PATH)\dbgrid.obj \
+               $(OBJ_PATH)\dbtable.obj \
+               $(OBJ_PATH)\dcbase.obj \
+               $(OBJ_PATH)\dircmn.obj \
+               $(OBJ_PATH)\dlgcmn.obj \
+               $(OBJ_PATH)\dndcmn.obj \
+               $(OBJ_PATH)\dobjcmn.obj \
+               $(OBJ_PATH)\docmdi.obj \
+               $(OBJ_PATH)\docview.obj \
+               $(OBJ_PATH)\dpycmn.obj \
+               $(OBJ_PATH)\dseldlg.obj \
+               $(OBJ_PATH)\dynarray.obj \
+               $(OBJ_PATH)\dynlib.obj \
+               $(OBJ_PATH)\dynload.obj \
+               $(OBJ_PATH)\effects.obj \
+               $(OBJ_PATH)\encconv.obj \
+               $(OBJ_PATH)\event.obj \
+               $(OBJ_PATH)\extended.obj \
+               $(OBJ_PATH)\fddlgcmn.obj \
+               $(OBJ_PATH)\ffile.obj \
+               $(OBJ_PATH)\file.obj \
+               $(OBJ_PATH)\fileconf.obj \
+               $(OBJ_PATH)\filefn.obj \
+               $(OBJ_PATH)\filename.obj \
+               $(OBJ_PATH)\filesys.obj \
+               $(OBJ_PATH)\fontcmn.obj \
+               $(OBJ_PATH)\fontmap.obj \
+               $(OBJ_PATH)\framecmn.obj \
+               $(OBJ_PATH)\fs_inet.obj \
+               $(OBJ_PATH)\fs_mem.obj \
+               $(OBJ_PATH)\fs_zip.obj \
+               $(OBJ_PATH)\ftp.obj \
+               $(OBJ_PATH)\gaugecmn.obj \
+               $(OBJ_PATH)\gdicmn.obj \
+               $(OBJ_PATH)\geometry.obj \
+               $(OBJ_PATH)\gifdecod.obj \
+               $(OBJ_PATH)\hash.obj \
+               $(OBJ_PATH)\hashmap.obj \
+               $(OBJ_PATH)\helpbase.obj \
+               $(OBJ_PATH)\http.obj \
+               $(OBJ_PATH)\iconbndl.obj \
+               $(OBJ_PATH)\imagall.obj \
+               $(OBJ_PATH)\imagbmp.obj \
+               $(OBJ_PATH)\image.obj \
+               $(OBJ_PATH)\imagfill.obj \
+               $(OBJ_PATH)\imaggif.obj \
+               $(OBJ_PATH)\imagiff.obj \
+               $(OBJ_PATH)\imagjpeg.obj \
+               $(OBJ_PATH)\imagpcx.obj \
+               $(OBJ_PATH)\imagpng.obj \
+               $(OBJ_PATH)\imagpnm.obj \
+               $(OBJ_PATH)\imagtiff.obj \
+               $(OBJ_PATH)\imagxpm.obj \
+               $(OBJ_PATH)\intl.obj \
+               $(OBJ_PATH)\ipcbase.obj \
+               $(OBJ_PATH)\layout.obj \
+               $(OBJ_PATH)\lboxcmn.obj \
+               $(OBJ_PATH)\list.obj \
+               $(OBJ_PATH)\log.obj \
+               $(OBJ_PATH)\longlong.obj \
+               $(OBJ_PATH)\matrix.obj \
+               $(OBJ_PATH)\memory.obj \
+               $(OBJ_PATH)\menucmn.obj \
+               $(OBJ_PATH)\mimecmn.obj \
+               $(OBJ_PATH)\module.obj \
+               $(OBJ_PATH)\msgout.obj \
+               $(OBJ_PATH)\mstream.obj \
+               $(OBJ_PATH)\nbkbase.obj \
+               $(OBJ_PATH)\object.obj \
+               $(OBJ_PATH)\paper.obj \
+               $(OBJ_PATH)\popupcmn.obj \
+               $(OBJ_PATH)\prntbase.obj \
+               $(OBJ_PATH)\process.obj \
+               $(OBJ_PATH)\protocol.obj \
+               $(OBJ_PATH)\quantize.obj \
+               $(OBJ_PATH)\radiocmn.obj \
+               $(OBJ_PATH)\regex.obj \
+               $(OBJ_PATH)\rgncmn.obj \
+               $(OBJ_PATH)\sckaddr.obj \
+               $(OBJ_PATH)\sckfile.obj \
+               $(OBJ_PATH)\sckipc.obj \
+               $(OBJ_PATH)\sckstrm.obj \
+               $(OBJ_PATH)\settcmn.obj \
+               $(OBJ_PATH)\sizer.obj \
+               $(OBJ_PATH)\socket.obj \
+               $(OBJ_PATH)\statbar.obj \
+               $(OBJ_PATH)\strconv.obj \
+               $(OBJ_PATH)\stream.obj \
+               $(OBJ_PATH)\string.obj \
+               $(OBJ_PATH)\sysopt.obj \
+               $(OBJ_PATH)\taskbarcmn.obj \
+               $(OBJ_PATH)\tbarbase.obj \
+               $(OBJ_PATH)\textbuf.obj \
+               $(OBJ_PATH)\textcmn.obj \
+               $(OBJ_PATH)\textfile.obj \
+               $(OBJ_PATH)\timercmn.obj \
+               $(OBJ_PATH)\tokenzr.obj \
+               $(OBJ_PATH)\toplvcmn.obj \
+               $(OBJ_PATH)\treebase.obj \
+               $(OBJ_PATH)\txtstrm.obj \
+               $(OBJ_PATH)\unzip.obj \
+               $(OBJ_PATH)\url.obj \
+               $(OBJ_PATH)\utilscmn.obj \
+               $(OBJ_PATH)\valgen.obj \
+               $(OBJ_PATH)\validate.obj \
+               $(OBJ_PATH)\valtext.obj \
+               $(OBJ_PATH)\variant.obj \
+               $(OBJ_PATH)\wfstream.obj \
+               $(OBJ_PATH)\wincmn.obj \
+               $(OBJ_PATH)\wxchar.obj \
+               $(OBJ_PATH)\xpmdecod.obj \
+               $(OBJ_PATH)\zipstrm.obj \
+               $(OBJ_PATH)\zstream.obj
 
 !if "$(WXUSINGUNIV)" == "1"
 OBJECTS = $(COMMONOBJS) $(GENERICUNIVOBJS) $(MSWUNIVOBJS) $(HTMLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS)
@@ -515,7 +514,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:    wx
 
-wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(ARCHINCDIR)\wx makeoutdir makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 all:    wx
 
@@ -530,15 +529,18 @@ makearchsetuph:
      copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH)
      cd $(WXDIR)\src\msw
 
+makeoutdir:
+    -mkdir $(OBJ_PATH)
+
 $(ARCHINCDIR)\wx:
     -mkdir $(ARCHINCDIR)
     -mkdir $(ARCHINCDIR)\wx
-    -erase $(CFG)
+    -if exist $(CFG) $(RM) $(CFG)
 
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-        -erase $(LIBTARGET)
+    -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
     tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
@@ -570,127 +572,127 @@ version.res:
 ########################################################
 # MSW objects (compile Native or UNIV) - UNIV
 
-$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
+$(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
-$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+$(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
 
-$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
+$(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
-$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
+$(OBJ_PATH)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
 
-$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
+$(OBJ_PATH)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
 
-$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
+$(OBJ_PATH)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
 
-$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
+$(OBJ_PATH)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
 
-$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
+$(OBJ_PATH)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
-$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
+$(OBJ_PATH)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
-$(MSWDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
+$(OBJ_PATH)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
 
-$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
+$(OBJ_PATH)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
-$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
+$(OBJ_PATH)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
 
-$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
+$(OBJ_PATH)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
 
-$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
+$(OBJ_PATH)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
 
-$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
+$(OBJ_PATH)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
 
-$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
+$(OBJ_PATH)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
 
-$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
+$(OBJ_PATH)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
 
-$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
+$(OBJ_PATH)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
-$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
+$(OBJ_PATH)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
-$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
+$(OBJ_PATH)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
-$(MSWDIR)\display.obj: $(MSWDIR)\display.$(SRCSUFF)
+$(OBJ_PATH)\display.obj: $(MSWDIR)\display.$(SRCSUFF)
 
-$(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
+$(OBJ_PATH)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
 
-$(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
+$(OBJ_PATH)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
-$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
+$(OBJ_PATH)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
 
-$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
+$(OBJ_PATH)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
 
-$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
+$(OBJ_PATH)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
-$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
+$(OBJ_PATH)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
 
-$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
+$(OBJ_PATH)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
 
-$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
+$(OBJ_PATH)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
-$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
+$(OBJ_PATH)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
-$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
+$(OBJ_PATH)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
-$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
+$(OBJ_PATH)\gsocket.obj: $(MSWDIR)\gsocket.c
 
-$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+$(OBJ_PATH)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
 
-$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
+$(OBJ_PATH)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
 
-$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
+$(OBJ_PATH)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
 
-$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
+$(OBJ_PATH)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
-$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
+$(OBJ_PATH)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
-$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
+$(OBJ_PATH)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
-$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
+$(OBJ_PATH)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
 
-$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
+$(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
 
-$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
+$(OBJ_PATH)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
-$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
+$(OBJ_PATH)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
 
-$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
+$(OBJ_PATH)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
 
-$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
+$(OBJ_PATH)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
-$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+$(OBJ_PATH)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
 
-$(MSWDIR)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
+$(OBJ_PATH)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
 
-$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
+$(OBJ_PATH)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
 
-$(MSWDIR)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
+$(OBJ_PATH)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
 
-$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
+$(OBJ_PATH)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
-$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
+$(OBJ_PATH)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
 
-$(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
+$(OBJ_PATH)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
 
-$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
+$(OBJ_PATH)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
 
-$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
+$(OBJ_PATH)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
-$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
+$(OBJ_PATH)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
 
-$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+$(OBJ_PATH)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
 
-$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
+$(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
-$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
+$(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
-$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
+$(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
-$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
+$(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
 
-$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
+$(OBJ_PATH)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
-$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
+$(OBJ_PATH)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 
 
@@ -699,225 +701,225 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 ########################################################
 # MSW objects (compile Native or UNIV) - Native
 
-$(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
+$(OBJ_PATH)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
-$(MSWDIR)\access.obj: $(OLEDIR)\access.$(SRCSUFF)
+$(OBJ_PATH)\access.obj: $(OLEDIR)\access.$(SRCSUFF)
 
-$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
+$(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
-$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+$(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
 
-$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
+$(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
-$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
+$(OBJ_PATH)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
 
-$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
+$(OBJ_PATH)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
 
-$(MSWDIR)\button.obj: $(MSWDIR)\button.$(SRCSUFF)
+$(OBJ_PATH)\button.obj: $(MSWDIR)\button.$(SRCSUFF)
 
-$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
+$(OBJ_PATH)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
 
-$(MSWDIR)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF)
+$(OBJ_PATH)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF)
 
-$(MSWDIR)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF)
+$(OBJ_PATH)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF)
 
-$(MSWDIR)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF)
+$(OBJ_PATH)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF)
 
-$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
+$(OBJ_PATH)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
 
-$(MSWDIR)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF)
+$(OBJ_PATH)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF)
 
-$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
+$(OBJ_PATH)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
 
-$(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
+$(OBJ_PATH)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
-$(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
+$(OBJ_PATH)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
+$(OBJ_PATH)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
-$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
+$(OBJ_PATH)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
-$(MSWDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
+$(OBJ_PATH)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
 
-$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
+$(OBJ_PATH)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
-$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
+$(OBJ_PATH)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
 
-$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
+$(OBJ_PATH)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
 
-$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
+$(OBJ_PATH)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
 
-$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
+$(OBJ_PATH)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
 
-$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
+$(OBJ_PATH)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
 
-$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
+$(OBJ_PATH)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
 
-$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
+$(OBJ_PATH)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
 
-$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
+$(OBJ_PATH)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
-$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
+$(OBJ_PATH)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
-$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
+$(OBJ_PATH)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
-$(MSWDIR)\display.obj: $(MSWDIR)\display.$(SRCSUFF)
+$(OBJ_PATH)\display.obj: $(MSWDIR)\display.$(SRCSUFF)
 
-$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
+$(OBJ_PATH)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
-$(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
+$(OBJ_PATH)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
 
-$(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
+$(OBJ_PATH)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
-$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
+$(OBJ_PATH)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
 
-$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
+$(OBJ_PATH)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
 
-$(MSWDIR)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF)
+$(OBJ_PATH)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF)
 
-$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
+$(OBJ_PATH)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
-$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
+$(OBJ_PATH)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
-$(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
+$(OBJ_PATH)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
 
-$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
+$(OBJ_PATH)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
 
-$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
+$(OBJ_PATH)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
 
-$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
+$(OBJ_PATH)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
-$(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
+$(OBJ_PATH)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
 
-$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
+$(OBJ_PATH)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
-$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
+$(OBJ_PATH)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
-$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
+$(OBJ_PATH)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
-$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
+$(OBJ_PATH)\gsocket.obj: $(MSWDIR)\gsocket.c
 
-$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+$(OBJ_PATH)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
 
-$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
+$(OBJ_PATH)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
 
-$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
+$(OBJ_PATH)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
 
-$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
+$(OBJ_PATH)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
-$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
+$(OBJ_PATH)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
-$(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
+$(OBJ_PATH)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
 
-$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+$(OBJ_PATH)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
 
-$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
+$(OBJ_PATH)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
-$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
+$(OBJ_PATH)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
 
-$(MSWDIR)\listctrl.obj: $(MSWDIR)\listctrl.$(SRCSUFF)
+$(OBJ_PATH)\listctrl.obj: $(MSWDIR)\listctrl.$(SRCSUFF)
 
-$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
+$(OBJ_PATH)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
 
-$(MSWDIR)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF)
+$(OBJ_PATH)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF)
 
-$(MSWDIR)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF)
+$(OBJ_PATH)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF)
 
-$(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF)
+$(OBJ_PATH)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF)
 
-$(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
+$(OBJ_PATH)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
 
-$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
+$(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
 
-$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
+$(OBJ_PATH)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
-$(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
+$(OBJ_PATH)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
-$(MSWDIR)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF)
+$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF)
 
-$(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
+$(OBJ_PATH)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
-$(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
+$(OBJ_PATH)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
 
-$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
+$(OBJ_PATH)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
 
-$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
+$(OBJ_PATH)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
-$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
+$(OBJ_PATH)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
 
-$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
+$(OBJ_PATH)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
-$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
+$(OBJ_PATH)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
-$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+$(OBJ_PATH)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
 
-$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
+$(OBJ_PATH)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
-$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
+$(OBJ_PATH)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
 
-$(MSWDIR)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF)
+$(OBJ_PATH)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF)
 
-$(MSWDIR)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF)
+$(OBJ_PATH)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF)
 
-$(MSWDIR)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
+$(OBJ_PATH)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
 
-$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
+$(OBJ_PATH)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
 
-$(MSWDIR)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
+$(OBJ_PATH)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
 
-$(MSWDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF)
+$(OBJ_PATH)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF)
 
-$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
+$(OBJ_PATH)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
-$(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
+$(OBJ_PATH)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
 
-$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
+$(OBJ_PATH)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
 
-$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
+$(OBJ_PATH)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
-$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
+$(OBJ_PATH)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
 
-$(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
+$(OBJ_PATH)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
 
-$(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)
+$(OBJ_PATH)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)
 
-$(MSWDIR)\statbr95.obj: $(MSWDIR)\statbr95.$(SRCSUFF)
+$(OBJ_PATH)\statbr95.obj: $(MSWDIR)\statbr95.$(SRCSUFF)
 
-$(MSWDIR)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF)
+$(OBJ_PATH)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF)
 
-$(MSWDIR)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF)
+$(OBJ_PATH)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF)
 
-$(MSWDIR)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF)
+$(OBJ_PATH)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF)
 
-$(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
+$(OBJ_PATH)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
 
-$(MSWDIR)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF)
+$(OBJ_PATH)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF)
 
-$(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
+$(OBJ_PATH)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
-$(MSWDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF)
+$(OBJ_PATH)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF)
 
-$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
+$(OBJ_PATH)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
 
-$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
+$(OBJ_PATH)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
-$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
+$(OBJ_PATH)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
 
-$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+$(OBJ_PATH)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
 
-$(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
+$(OBJ_PATH)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
 
-$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
+$(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
-$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
+$(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
-$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
+$(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
-$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
+$(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
 
-$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
+$(OBJ_PATH)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
-$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
+$(OBJ_PATH)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 
 !endif
@@ -925,73 +927,73 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 !if "$(WXUSINGUNIV)" == "1"
 ########################################################
 # UNIV objects 
-$(MSWDIR)\bmpbuttn.obj: $(UNIVDIR)\bmpbuttn.$(SRCSUFF)
+$(OBJ_PATH)\bmpbuttn.obj: $(UNIVDIR)\bmpbuttn.$(SRCSUFF)
 
-$(MSWDIR)\button.obj: $(UNIVDIR)\button.$(SRCSUFF)
+$(OBJ_PATH)\button.obj: $(UNIVDIR)\button.$(SRCSUFF)
 
-$(MSWDIR)\checkbox.obj: $(UNIVDIR)\checkbox.$(SRCSUFF)
+$(OBJ_PATH)\checkbox.obj: $(UNIVDIR)\checkbox.$(SRCSUFF)
 
-$(MSWDIR)\checklst.obj: $(UNIVDIR)\checklst.$(SRCSUFF)
+$(OBJ_PATH)\checklst.obj: $(UNIVDIR)\checklst.$(SRCSUFF)
 
-$(MSWDIR)\choice.obj: $(UNIVDIR)\choice.$(SRCSUFF)
+$(OBJ_PATH)\choice.obj: $(UNIVDIR)\choice.$(SRCSUFF)
 
-$(MSWDIR)\colschem.obj: $(UNIVDIR)\colschem.$(SRCSUFF)
+$(OBJ_PATH)\colschem.obj: $(UNIVDIR)\colschem.$(SRCSUFF)
 
-$(MSWDIR)\combobox.obj: $(UNIVDIR)\combobox.$(SRCSUFF)
+$(OBJ_PATH)\combobox.obj: $(UNIVDIR)\combobox.$(SRCSUFF)
 
-$(MSWDIR)\control.obj: $(UNIVDIR)\control.$(SRCSUFF)
+$(OBJ_PATH)\control.obj: $(UNIVDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\dialog.obj: $(UNIVDIR)\dialog.$(SRCSUFF)
+$(OBJ_PATH)\dialog.obj: $(UNIVDIR)\dialog.$(SRCSUFF)
 
-$(MSWDIR)\framuniv.obj: $(UNIVDIR)\framuniv.$(SRCSUFF)
+$(OBJ_PATH)\framuniv.obj: $(UNIVDIR)\framuniv.$(SRCSUFF)
 
-$(MSWDIR)\gauge.obj: $(UNIVDIR)\gauge.$(SRCSUFF)
+$(OBJ_PATH)\gauge.obj: $(UNIVDIR)\gauge.$(SRCSUFF)
 
-$(MSWDIR)\inpcons.obj: $(UNIVDIR)\inpcons.$(SRCSUFF)
+$(OBJ_PATH)\inpcons.obj: $(UNIVDIR)\inpcons.$(SRCSUFF)
 
-$(MSWDIR)\inphand.obj: $(UNIVDIR)\inphand.$(SRCSUFF)
+$(OBJ_PATH)\inphand.obj: $(UNIVDIR)\inphand.$(SRCSUFF)
 
-$(MSWDIR)\listbox.obj: $(UNIVDIR)\listbox.$(SRCSUFF)
+$(OBJ_PATH)\listbox.obj: $(UNIVDIR)\listbox.$(SRCSUFF)
 
-$(MSWDIR)\menu.obj: $(UNIVDIR)\menu.$(SRCSUFF)
+$(OBJ_PATH)\menu.obj: $(UNIVDIR)\menu.$(SRCSUFF)
 
-$(MSWDIR)\notebook.obj: $(UNIVDIR)\notebook.$(SRCSUFF)
+$(OBJ_PATH)\notebook.obj: $(UNIVDIR)\notebook.$(SRCSUFF)
 
-$(MSWDIR)\radiobox.obj: $(UNIVDIR)\radiobox.$(SRCSUFF)
+$(OBJ_PATH)\radiobox.obj: $(UNIVDIR)\radiobox.$(SRCSUFF)
 
-$(MSWDIR)\radiobut.obj: $(UNIVDIR)\radiobut.$(SRCSUFF)
+$(OBJ_PATH)\radiobut.obj: $(UNIVDIR)\radiobut.$(SRCSUFF)
 
-$(MSWDIR)\renderer.obj: $(UNIVDIR)\renderer.$(SRCSUFF)
+$(OBJ_PATH)\renderer.obj: $(UNIVDIR)\renderer.$(SRCSUFF)
 
-$(MSWDIR)\scrarrow.obj: $(UNIVDIR)\scrarrow.$(SRCSUFF)
+$(OBJ_PATH)\scrarrow.obj: $(UNIVDIR)\scrarrow.$(SRCSUFF)
 
-$(MSWDIR)\scrolbar.obj: $(UNIVDIR)\scrolbar.$(SRCSUFF)
+$(OBJ_PATH)\scrolbar.obj: $(UNIVDIR)\scrolbar.$(SRCSUFF)
 
-$(MSWDIR)\scrthumb.obj: $(UNIVDIR)\scrthumb.$(SRCSUFF)
+$(OBJ_PATH)\scrthumb.obj: $(UNIVDIR)\scrthumb.$(SRCSUFF)
 
-$(MSWDIR)\slider.obj: $(UNIVDIR)\slider.$(SRCSUFF)
+$(OBJ_PATH)\slider.obj: $(UNIVDIR)\slider.$(SRCSUFF)
 
-$(MSWDIR)\spinbutt.obj: $(UNIVDIR)\spinbutt.$(SRCSUFF)
+$(OBJ_PATH)\spinbutt.obj: $(UNIVDIR)\spinbutt.$(SRCSUFF)
 
-$(MSWDIR)\statbmp.obj: $(UNIVDIR)\statbmp.$(SRCSUFF)
+$(OBJ_PATH)\statbmp.obj: $(UNIVDIR)\statbmp.$(SRCSUFF)
 
-$(MSWDIR)\statbox.obj: $(UNIVDIR)\statbox.$(SRCSUFF)
+$(OBJ_PATH)\statbox.obj: $(UNIVDIR)\statbox.$(SRCSUFF)
 
-$(MSWDIR)\statline.obj: $(UNIVDIR)\statline.$(SRCSUFF)
+$(OBJ_PATH)\statline.obj: $(UNIVDIR)\statline.$(SRCSUFF)
 
-$(MSWDIR)\stattext.obj: $(UNIVDIR)\stattext.$(SRCSUFF)
+$(OBJ_PATH)\stattext.obj: $(UNIVDIR)\stattext.$(SRCSUFF)
 
-$(MSWDIR)\statusbr.obj: $(UNIVDIR)\statusbr.$(SRCSUFF)
+$(OBJ_PATH)\statusbr.obj: $(UNIVDIR)\statusbr.$(SRCSUFF)
 
-$(MSWDIR)\textctrl.obj: $(UNIVDIR)\textctrl.$(SRCSUFF)
+$(OBJ_PATH)\textctrl.obj: $(UNIVDIR)\textctrl.$(SRCSUFF)
 
-$(MSWDIR)\theme.obj: $(UNIVDIR)\theme.$(SRCSUFF)
+$(OBJ_PATH)\theme.obj: $(UNIVDIR)\theme.$(SRCSUFF)
 
-$(MSWDIR)\toolbar.obj: $(UNIVDIR)\toolbar.$(SRCSUFF)
+$(OBJ_PATH)\toolbar.obj: $(UNIVDIR)\toolbar.$(SRCSUFF)
 
-$(MSWDIR)\topluniv.obj: $(UNIVDIR)\topluniv.$(SRCSUFF)
+$(OBJ_PATH)\topluniv.obj: $(UNIVDIR)\topluniv.$(SRCSUFF)
 
-$(MSWDIR)\winuniv.obj: $(UNIVDIR)\winuniv.$(SRCSUFF)
+$(OBJ_PATH)\winuniv.obj: $(UNIVDIR)\winuniv.$(SRCSUFF)
 
 
 
@@ -999,11 +1001,11 @@ $(MSWDIR)\winuniv.obj: $(UNIVDIR)\winuniv.$(SRCSUFF)
 ########################################################
 # UNIV THEME objects 
 
-$(MSWDIR)\gtk.obj: $(UNIVTHEMEDIR)\gtk.$(SRCSUFF)
+$(OBJ_PATH)\gtk.obj: $(UNIVTHEMEDIR)\gtk.$(SRCSUFF)
 
-$(MSWDIR)\metal.obj: $(UNIVTHEMEDIR)\metal.$(SRCSUFF)
+$(OBJ_PATH)\metal.obj: $(UNIVTHEMEDIR)\metal.$(SRCSUFF)
 
-$(MSWDIR)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF)
+$(OBJ_PATH)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF)
 
 
 
@@ -1012,269 +1014,269 @@ $(MSWDIR)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF)
 ########################################################
 # Common objects (always compiled)
 
-$(MSWDIR)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF)
+$(OBJ_PATH)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF)
 
-$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
+$(OBJ_PATH)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
-$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
+$(OBJ_PATH)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
 
-$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF)
+$(OBJ_PATH)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF)
 
-$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
+$(OBJ_PATH)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
-$(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
+$(OBJ_PATH)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
 
-$(MSWDIR)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF)
+$(OBJ_PATH)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF)
 
-$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
+$(OBJ_PATH)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
 
-$(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF)
+$(OBJ_PATH)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF)
 
-$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
+$(OBJ_PATH)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
-$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
+$(OBJ_PATH)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
-$(MSWDIR)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF)
+$(OBJ_PATH)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF)
 
-$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
+$(OBJ_PATH)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
 
-$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
+$(OBJ_PATH)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
-$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
+$(OBJ_PATH)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
 
-$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF)
+$(OBJ_PATH)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF)
 
-$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
+$(OBJ_PATH)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
 
-$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
+$(OBJ_PATH)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
-$(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
+$(OBJ_PATH)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
 
-$(MSWDIR)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF)
+$(OBJ_PATH)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF)
 
-$(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
+$(OBJ_PATH)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
-$(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
+$(OBJ_PATH)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
-$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+$(OBJ_PATH)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
 
-$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
+$(OBJ_PATH)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
-$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
+$(OBJ_PATH)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
 
-$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
+$(OBJ_PATH)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
 
-$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
+$(OBJ_PATH)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
-$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
+$(OBJ_PATH)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
-$(MSWDIR)\dpycmn.obj: $(COMMDIR)\dpycmn.$(SRCSUFF)
+$(OBJ_PATH)\dpycmn.obj: $(COMMDIR)\dpycmn.$(SRCSUFF)
 
-$(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
+$(OBJ_PATH)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
 
-$(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
+$(OBJ_PATH)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
-$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
+$(OBJ_PATH)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
-$(MSWDIR)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF)
+$(OBJ_PATH)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF)
 
-$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
+$(OBJ_PATH)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
 
-$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
+$(OBJ_PATH)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
 
-$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
+$(OBJ_PATH)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
-$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
+$(OBJ_PATH)\extended.obj: $(COMMDIR)\extended.c
 
-$(MSWDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF)
+$(OBJ_PATH)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF)
 
-$(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
+$(OBJ_PATH)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
-$(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
+$(OBJ_PATH)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
 
-$(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
+$(OBJ_PATH)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
 
-$(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
+$(OBJ_PATH)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
-$(MSWDIR)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
+$(OBJ_PATH)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
 
-$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
+$(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
-$(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
+$(OBJ_PATH)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 
-$(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
+$(OBJ_PATH)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
 
-$(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
+$(OBJ_PATH)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
-$(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
+$(OBJ_PATH)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
-$(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
+$(OBJ_PATH)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
 
-$(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
+$(OBJ_PATH)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
-$(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
+$(OBJ_PATH)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
 
-$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
+$(OBJ_PATH)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
 
-$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
+$(OBJ_PATH)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
-$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
+$(OBJ_PATH)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
 
-$(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
+$(OBJ_PATH)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
-$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
+$(OBJ_PATH)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
-$(MSWDIR)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF)
+$(OBJ_PATH)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF)
 
-$(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
+$(OBJ_PATH)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
-$(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
+$(OBJ_PATH)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
 
-$(MSWDIR)\iconbndl.obj: $(COMMDIR)\iconbndl.$(SRCSUFF)
+$(OBJ_PATH)\iconbndl.obj: $(COMMDIR)\iconbndl.$(SRCSUFF)
 
-$(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
+$(OBJ_PATH)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
 
-$(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
+$(OBJ_PATH)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
-$(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
+$(OBJ_PATH)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
-$(MSWDIR)\imagfill.obj: $(COMMDIR)\imagfill.$(SRCSUFF)
+$(OBJ_PATH)\imagfill.obj: $(COMMDIR)\imagfill.$(SRCSUFF)
 
-$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
+$(OBJ_PATH)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
-$(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
+$(OBJ_PATH)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
 
-$(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
+$(OBJ_PATH)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
-$(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
+$(OBJ_PATH)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
 
-$(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
+$(OBJ_PATH)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
 
-$(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
+$(OBJ_PATH)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
 
-$(MSWDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
+$(OBJ_PATH)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
 
-$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+$(OBJ_PATH)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
 
-$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
+$(OBJ_PATH)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
-$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
+$(OBJ_PATH)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
 
-$(MSWDIR)\layout.obj: $(COMMDIR)\layout.$(SRCSUFF)
+$(OBJ_PATH)\layout.obj: $(COMMDIR)\layout.$(SRCSUFF)
 
-$(MSWDIR)\lboxcmn.obj: $(COMMDIR)\lboxcmn.$(SRCSUFF)
+$(OBJ_PATH)\lboxcmn.obj: $(COMMDIR)\lboxcmn.$(SRCSUFF)
 
-$(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
+$(OBJ_PATH)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
 
-$(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
+$(OBJ_PATH)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
 
-$(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
+$(OBJ_PATH)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
 
-$(MSWDIR)\matrix.obj: $(COMMDIR)\matrix.$(SRCSUFF)
+$(OBJ_PATH)\matrix.obj: $(COMMDIR)\matrix.$(SRCSUFF)
 
-$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
+$(OBJ_PATH)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
-$(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
+$(OBJ_PATH)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
 
-$(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF)
+$(OBJ_PATH)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF)
 
-$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
+$(OBJ_PATH)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
-$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF)
+$(OBJ_PATH)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF)
 
-$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
+$(OBJ_PATH)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
-$(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
+$(OBJ_PATH)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
 
-$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
+$(OBJ_PATH)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
 
-$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
+$(OBJ_PATH)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
-$(MSWDIR)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF)
+$(OBJ_PATH)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF)
 
-$(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
+$(OBJ_PATH)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
-$(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
+$(OBJ_PATH)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
 
-$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+$(OBJ_PATH)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
-$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
+$(OBJ_PATH)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
 
-$(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF)
+$(OBJ_PATH)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF)
 
-$(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
+$(OBJ_PATH)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
 
-$(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
+$(OBJ_PATH)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
 
-$(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
+$(OBJ_PATH)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
-$(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
+$(OBJ_PATH)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
 
-$(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
+$(OBJ_PATH)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
-$(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
+$(OBJ_PATH)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
-$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
+$(OBJ_PATH)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
 
-$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
+$(OBJ_PATH)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
-$(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
+$(OBJ_PATH)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 
-$(MSWDIR)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF)
+$(OBJ_PATH)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF)
 
-$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
+$(OBJ_PATH)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
 
-$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
+$(OBJ_PATH)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
-$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
+$(OBJ_PATH)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 
-$(MSWDIR)\sysopt.obj: $(COMMDIR)\sysopt.$(SRCSUFF)
+$(OBJ_PATH)\sysopt.obj: $(COMMDIR)\sysopt.$(SRCSUFF)
 
-$(MSWDIR)\taskbarcmn.obj: $(COMMDIR)\taskbarcmn.$(SRCSUFF)
+$(OBJ_PATH)\taskbarcmn.obj: $(COMMDIR)\taskbarcmn.$(SRCSUFF)
 
-$(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
+$(OBJ_PATH)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
-$(MSWDIR)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF)
+$(OBJ_PATH)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF)
 
-$(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
+$(OBJ_PATH)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
-$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
+$(OBJ_PATH)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
-$(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
+$(OBJ_PATH)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
-$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
+$(OBJ_PATH)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
-$(MSWDIR)\toplvcmn.obj: $(COMMDIR)\toplvcmn.$(SRCSUFF)
+$(OBJ_PATH)\toplvcmn.obj: $(COMMDIR)\toplvcmn.$(SRCSUFF)
 
-$(MSWDIR)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
+$(OBJ_PATH)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
 
-$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
+$(OBJ_PATH)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
-$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
+$(OBJ_PATH)\unzip.obj: $(COMMDIR)\unzip.c
 
-$(MSWDIR)\url.obj: $(COMMDIR)\url.$(SRCSUFF)
+$(OBJ_PATH)\url.obj: $(COMMDIR)\url.$(SRCSUFF)
 
-$(MSWDIR)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF)
+$(OBJ_PATH)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF)
 
-$(MSWDIR)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF)
+$(OBJ_PATH)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF)
 
-$(MSWDIR)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF)
+$(OBJ_PATH)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF)
 
-$(MSWDIR)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF)
+$(OBJ_PATH)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF)
 
-$(MSWDIR)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF)
+$(OBJ_PATH)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF)
 
-$(MSWDIR)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF)
+$(OBJ_PATH)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF)
 
-$(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF)
+$(OBJ_PATH)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF)
 
-$(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
+$(OBJ_PATH)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
-$(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
+$(OBJ_PATH)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
 
-$(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
+$(OBJ_PATH)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
 
-$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
+$(OBJ_PATH)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 
 
@@ -1285,83 +1287,83 @@ $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 # Native
 
 
-$(MSWDIR)\accel.obj: $(GENDIR)\accel.$(SRCSUFF)
+$(OBJ_PATH)\accel.obj: $(GENDIR)\accel.$(SRCSUFF)
 
-$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
+$(OBJ_PATH)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
-$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
+$(OBJ_PATH)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
-$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
+$(OBJ_PATH)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\colrdlgg.obj: $(GENDIR)\colrdlgg.$(SRCSUFF)
+$(OBJ_PATH)\colrdlgg.obj: $(GENDIR)\colrdlgg.$(SRCSUFF)
 
-$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+$(OBJ_PATH)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
 
-$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+$(OBJ_PATH)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
 
-$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+$(OBJ_PATH)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
 
-$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
+$(OBJ_PATH)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
 
-$(MSWDIR)\fdrepdlg.obj: $(GENDIR)\fdrepdlg.$(SRCSUFF)
+$(OBJ_PATH)\fdrepdlg.obj: $(GENDIR)\fdrepdlg.$(SRCSUFF)
 
-$(MSWDIR)\filedlgg.obj: $(GENDIR)\filedlgg.$(SRCSUFF)
+$(OBJ_PATH)\filedlgg.obj: $(GENDIR)\filedlgg.$(SRCSUFF)
 
-$(MSWDIR)\fontdlgg.obj: $(GENDIR)\fontdlgg.$(SRCSUFF)
+$(OBJ_PATH)\fontdlgg.obj: $(GENDIR)\fontdlgg.$(SRCSUFF)
 
-$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+$(OBJ_PATH)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
-$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+$(OBJ_PATH)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
 
-$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+$(OBJ_PATH)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
-$(MSWDIR)\helpext.obj: $(GENDIR)\helpext.$(SRCSUFF)
+$(OBJ_PATH)\helpext.obj: $(GENDIR)\helpext.$(SRCSUFF)
 
-$(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
+$(OBJ_PATH)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
 
-$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
+$(OBJ_PATH)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
-$(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
+$(OBJ_PATH)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
 
-$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+$(OBJ_PATH)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
 
-$(MSWDIR)\mdig.obj: $(GENDIR)\mdig.$(SRCSUFF)
+$(OBJ_PATH)\mdig.obj: $(GENDIR)\mdig.$(SRCSUFF)
 
-$(MSWDIR)\msgdlgg.obj: $(GENDIR)\msgdlgg.$(SRCSUFF)
+$(OBJ_PATH)\msgdlgg.obj: $(GENDIR)\msgdlgg.$(SRCSUFF)
 
-$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
+$(OBJ_PATH)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
-$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
+$(OBJ_PATH)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
+$(OBJ_PATH)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
 
-$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
+$(OBJ_PATH)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
 
-$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
+$(OBJ_PATH)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
+$(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
-$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
+$(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
 
-$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
+$(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
 
-$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
+$(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
 
-$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
+$(OBJ_PATH)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
-$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
+$(OBJ_PATH)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
 
-$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
+$(OBJ_PATH)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
 
-$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
+$(OBJ_PATH)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
-$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
+$(OBJ_PATH)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
-$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
+$(OBJ_PATH)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
 
-$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+$(OBJ_PATH)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
 
-$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
+$(OBJ_PATH)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
 
@@ -1371,59 +1373,59 @@ $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 # whether platforms have native implementations)
 # Native
 
-$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
+$(OBJ_PATH)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
-$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
+$(OBJ_PATH)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
-$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
+$(OBJ_PATH)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+$(OBJ_PATH)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
 
-$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+$(OBJ_PATH)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
 
-$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+$(OBJ_PATH)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
 
-$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
+$(OBJ_PATH)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
 
-$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+$(OBJ_PATH)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
-$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+$(OBJ_PATH)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
 
-$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+$(OBJ_PATH)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
-$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
+$(OBJ_PATH)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
-$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+$(OBJ_PATH)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
 
-$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
+$(OBJ_PATH)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
-$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
+$(OBJ_PATH)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
+$(OBJ_PATH)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
+$(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
-$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
+$(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
 
-$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
+$(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
 
-$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
+$(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
 
-$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
+$(OBJ_PATH)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
-$(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
+$(OBJ_PATH)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
 
-$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
+$(OBJ_PATH)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
 
-$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
+$(OBJ_PATH)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
-$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
+$(OBJ_PATH)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
-$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
+$(OBJ_PATH)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
 
-$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+$(OBJ_PATH)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
 
-$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
+$(OBJ_PATH)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
 !endif
@@ -1431,45 +1433,45 @@ $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 ########################################################
 # HTML objects (always compiled)
 
-$(MSWDIR)\helpctrl.obj: $(HTMLDIR)\helpctrl.$(SRCSUFF)
+$(OBJ_PATH)\helpctrl.obj: $(HTMLDIR)\helpctrl.$(SRCSUFF)
 
-$(MSWDIR)\helpdata.obj: $(HTMLDIR)\helpdata.$(SRCSUFF)
+$(OBJ_PATH)\helpdata.obj: $(HTMLDIR)\helpdata.$(SRCSUFF)
 
-$(MSWDIR)\helpfrm.obj: $(HTMLDIR)\helpfrm.$(SRCSUFF)
+$(OBJ_PATH)\helpfrm.obj: $(HTMLDIR)\helpfrm.$(SRCSUFF)
 
-$(MSWDIR)\htmlcell.obj: $(HTMLDIR)\htmlcell.$(SRCSUFF)
+$(OBJ_PATH)\htmlcell.obj: $(HTMLDIR)\htmlcell.$(SRCSUFF)
 
-$(MSWDIR)\htmlfilt.obj: $(HTMLDIR)\htmlfilt.$(SRCSUFF)
+$(OBJ_PATH)\htmlfilt.obj: $(HTMLDIR)\htmlfilt.$(SRCSUFF)
 
-$(MSWDIR)\htmlpars.obj: $(HTMLDIR)\htmlpars.$(SRCSUFF)
+$(OBJ_PATH)\htmlpars.obj: $(HTMLDIR)\htmlpars.$(SRCSUFF)
 
-$(MSWDIR)\htmltag.obj: $(HTMLDIR)\htmltag.$(SRCSUFF)
+$(OBJ_PATH)\htmltag.obj: $(HTMLDIR)\htmltag.$(SRCSUFF)
 
-$(MSWDIR)\htmlwin.obj: $(HTMLDIR)\htmlwin.$(SRCSUFF)
+$(OBJ_PATH)\htmlwin.obj: $(HTMLDIR)\htmlwin.$(SRCSUFF)
 
-$(MSWDIR)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF)
+$(OBJ_PATH)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF)
 
-$(MSWDIR)\m_dflist.obj: $(HTMLDIR)\m_dflist.$(SRCSUFF)
+$(OBJ_PATH)\m_dflist.obj: $(HTMLDIR)\m_dflist.$(SRCSUFF)
 
-$(MSWDIR)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF)
+$(OBJ_PATH)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF)
 
-$(MSWDIR)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF)
+$(OBJ_PATH)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF)
 
-$(MSWDIR)\m_image.obj: $(HTMLDIR)\m_image.$(SRCSUFF)
+$(OBJ_PATH)\m_image.obj: $(HTMLDIR)\m_image.$(SRCSUFF)
 
-$(MSWDIR)\m_layout.obj: $(HTMLDIR)\m_layout.$(SRCSUFF)
+$(OBJ_PATH)\m_layout.obj: $(HTMLDIR)\m_layout.$(SRCSUFF)
 
-$(MSWDIR)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF)
+$(OBJ_PATH)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF)
 
-$(MSWDIR)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF)
+$(OBJ_PATH)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF)
 
-$(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
+$(OBJ_PATH)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
-$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
+$(OBJ_PATH)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
 
-$(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
+$(OBJ_PATH)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
 
-$(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
+$(OBJ_PATH)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
 
 
 
@@ -1491,58 +1493,58 @@ all_execs:
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL)
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL)
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32
     copy &&!
 -Hc
--H=$(WXDIR)\src\msw\wx32.csm
+-H=$(OBJ_PATH)\wx32.csm
 -3
 -d
 -a1 # byte alignment
@@ -1566,15 +1568,21 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
+cleancfg:
+    -if exist $(OBJ_PATH)\*.cfg $(RM) $(OBJ_PATH)\*.cfg    
+
 clean: $(PERIPH_CLEAN_TARGET)
-    -erase $(WXLIBDIR)\wx.tds
-    -erase $(WXLIBDIR)\wx.il?
-    -erase *.obj
-    -erase *.pch
-    -erase *.csm
-    -erase "wx32.#??"
+    -if exist $(WXLIBDIR)\wx.il? $(RM) $(WXLIBDIR)\wx.tds
+    -if exist $(WXLIBDIR)\wx.il? $(RM) $(WXLIBDIR)\wx.il?
+    -if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj    
+    -if exist $(OBJ_PATH)\*.csm $(RM) $(OBJ_PATH)\*.csm    
+    -if exist "$(OBJ_PATH)\wx32.#??" $(RM) "$(OBJ_PATH)\wx32.#??"
+    -if exist *.pch $(RM) *.pch
+    -if exist *.csm $(RM) *.csm
+    -if exist *.obj $(RM) *.obj
+    -if exist "wx32.#??" $(RM) "wx32.#??"
 
-cleanall: clean
+cleanall: clean cleancfg
 
 
 # Making documents
@@ -1664,7 +1672,7 @@ allpdfrtf: pdfrtf portingpdfrtf
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
-        -erase wx.ph
+        -if exist wx.ph $(RM)  wx.ph
         hc wx
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
@@ -1672,7 +1680,7 @@ $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
 
 $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
         cd $(DOCDIR)/latex/porting
-        -erase porting.ph
+        -if exist porting.ph $(RM)  porting.ph
         hc porting
         move porting.hlp $(DOCDIR)\winhelp\porting.hlp
         move porting.cnt $(DOCDIR)\winhelp\porting.cnt
@@ -1680,7 +1688,7 @@ $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOC
 
 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
-        -erase techref.ph
+        -if exist techref.ph $(RM)  techref.ph
         hc techref
         move techref.hlp $(DOCDIR)\winhelp\techref.hlp
         move techref.cnt $(DOCDIR)\winhelp\techref.cnt
@@ -1726,10 +1734,10 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-        -erase $(DOCDIR)\html\wx\*.con
-        -erase $(DOCDIR)\html\wx\*.ref
-        -erase $(DOCDIR)\latex\wx\*.con
-        -erase $(DOCDIR)\latex\wx\*.ref
+        -if exist $(DOCDIR)\html\wx\*.con $(RM)  $(DOCDIR)\html\wx\*.con
+        -if exist $(DOCDIR)\html\wx\*.ref $(RM)  $(DOCDIR)\html\wx\*.ref
+        -if exist $(DOCDIR)\latex\wx\*.con $(RM)  $(DOCDIR)\latex\wx\*.con
+        -if exist $(DOCDIR)\latex\wx\*.ref $(RM)  $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
 $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
@@ -1742,10 +1750,10 @@ $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
         cd $(DOCDIR)\latex\porting
         -mkdir $(DOCDIR)\html\porting
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-        -erase $(DOCDIR)\html\porting\*.con
-        -erase $(DOCDIR)\html\porting\*.ref
-        -erase $(DOCDIR)\latex\porting\*.con
-        -erase $(DOCDIR)\latex\porting\*.ref
+        -if exist $(DOCDIR)\html\porting\*.con $(RM)  $(DOCDIR)\html\porting\*.con
+        -if exist $(DOCDIR)\html\porting\*.ref $(RM)  $(DOCDIR)\html\porting\*.ref
+        -if exist $(DOCDIR)\latex\porting\*.con $(RM)  $(DOCDIR)\latex\porting\*.con
+        -if exist $(DOCDIR)\latex\porting\*.ref $(RM)  $(DOCDIR)\latex\porting\*.ref
         cd $(THISDIR)
 
 $(WXDIR)\docs\latex\wx\manual.dvi:  $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
@@ -1813,6 +1821,12 @@ MFTYPE=b32
 # makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
 
 self:
+!if "$(TM)"=="" 
+       @echo Error in Environment!
+       @echo Please set TM in the environment to the directory containing tmake binaries
+       @echo eg set TM=c:\wx\tmake\bin
+!else
     cd $(WXWIN)\distrib\msw\tmake
-    tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+    perl $(TM)\tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
     copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+!endif

diff --git a/src/png/makefile.b32 b/src/png/makefile.b32
index 19fb0727b7d0177bbecbfff036ee22644f09a225..aeb245d29a8f4905278880a95e2ab715c5a39559 100644 (file)
--- a/src/png/makefile.b32
+++ b/src/png/makefile.b32
@@ -2,7 +2,7 @@
 # File:                makefile.b32
 # Author:      Julian Smart
 # Created:     1993
-# Updated:     
+# Updated:
 # Copyright:
 #
 # "%W% %G%"
@@ -11,15 +11,61 @@
 
 # WXWIN and BCCDIR are set by parent make
 
-LIBTARGET =..\..\lib\winpng.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
+WXWIN=..\..
+LIBTARGET=png
+
+!include ..\makeb32.env
+
+OBJECTS = $(OBJ_PATH)\png.obj \
+       $(OBJ_PATH)\pngread.obj \
+       $(OBJ_PATH)\pngrtran.obj \
+       $(OBJ_PATH)\pngrutil.obj \
+       $(OBJ_PATH)\pngpread.obj \
+       $(OBJ_PATH)\pngtrans.obj \
+       $(OBJ_PATH)\pngwrite.obj \
+       $(OBJ_PATH)\pngwtran.obj \
+       $(OBJ_PATH)\pngwutil.obj \
+       $(OBJ_PATH)\pngerror.obj \
+       $(OBJ_PATH)\pngmem.obj \
+       $(OBJ_PATH)\pngwio.obj \
+       $(OBJ_PATH)\pngrio.obj \
+       $(OBJ_PATH)\pngget.obj \
+       $(OBJ_PATH)\pngset.obj
 
 # Precompiled headers seem to interfere with correct compilation
 # of png library, so switch them off
 EXTRACPPFLAGS=-H-
 
-!include $(WXWIN)\src\makelib.b32
 
+$(OBJ_PATH)\png.obj: png.c
+
+$(OBJ_PATH)\pngread.obj: pngread.c
+
+$(OBJ_PATH)\pngrtran.obj: pngrtran.c
+
+$(OBJ_PATH)\pngrutil.obj: pngrutil.c
+
+$(OBJ_PATH)\pngpread.obj: pngpread.c
+
+$(OBJ_PATH)\pngtrans.obj: pngtrans.c
+
+$(OBJ_PATH)\pngwrite.obj: pngwrite.c
+
+$(OBJ_PATH)\pngwtran.obj: pngwtran.c
+
+$(OBJ_PATH)\pngwutil.obj: pngwutil.c
+
+$(OBJ_PATH)\pngerror.obj: pngerror.c
+
+$(OBJ_PATH)\pngmem.obj: pngmem.c
+
+$(OBJ_PATH)\pngwio.obj: pngwio.c
+
+$(OBJ_PATH)\pngrio.obj: pngrio.c
+
+$(OBJ_PATH)\pngget.obj: pngget.c
+
+$(OBJ_PATH)\pngset.obj: pngset.c
+
+!include ..\makelib.b32

diff --git a/src/regex/makefile.b32 b/src/regex/makefile.b32
index 321e2edc987ef0e1e4e9a2de57159bc07754ba73..cfb29c052991cb3f6c5d14b251563022d84c9e9d 100644 (file)
--- a/src/regex/makefile.b32
+++ b/src/regex/makefile.b32
@@ -1,13 +1,38 @@
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1993
+# Updated:
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds TIFF library (BC++ 32-bit)
+
+# WXWIN and BCCDIR are set by parent make
+
+
+WXWIN=..\..
+LIBTARGET=regex
+
+!include ..\makeb32.env
 
-LIBTARGET=$(WXDIR)\lib\regex.lib
 
 OBJECTS= \
-               regcomp.obj \
-               regexec.obj \
-               regerror.obj \
-               regfree.obj
+               $(OBJ_PATH)\regcomp.obj \
+               $(OBJ_PATH)\regexec.obj \
+               $(OBJ_PATH)\regerror.obj \
+               $(OBJ_PATH)\regfree.obj
 
 # Pull in standard variable definitions
 
+
+$(OBJ_PATH)\regcomp.obj: regcomp.c
+
+$(OBJ_PATH)\regexec.obj: regexec.c
+
+$(OBJ_PATH)\regerror.obj: regerror.c
+
+$(OBJ_PATH)\regfree.obj: regfree.c
+
 !include ..\makelib.b32
 

diff --git a/src/tiff/makefile.b32 b/src/tiff/makefile.b32
index 86ce9c9b158a1cad111ec9bfd8c9088b0451cf09..e8645ebc3d495a755e288f78f88994c7a31ce486 100644 (file)
--- a/src/tiff/makefile.b32
+++ b/src/tiff/makefile.b32
@@ -1,44 +1,123 @@
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1993
+# Updated:
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds TIFF library (BC++ 32-bit)
 
-LIBTARGET=$(WXDIR)\lib\tiff.lib
+# WXWIN and BCCDIR are set by parent make
 
-OBJECTS= \
-               tif_aux.obj \
-               tif_close.obj \
-               tif_codec.obj \
-               tif_compress.obj \
-               tif_dir.obj \
-               tif_dirinfo.obj \
-               tif_dirread.obj \
-               tif_dirwrite.obj \
-               tif_dumpmode.obj \
-               tif_error.obj \
-               tif_fax3.obj \
-               tif_fax3sm.obj \
-               tif_flush.obj \
-               tif_getimage.obj \
-               tif_jpeg.obj \
-               tif_luv.obj \
-               tif_lzw.obj \
-               tif_next.obj \
-               tif_open.obj \
-               tif_packbits.obj \
-               tif_pixarlog.obj \
-               tif_predict.obj \
-               tif_print.obj \
-               tif_read.obj \
-               tif_strip.obj \
-               tif_swab.obj \
-               tif_thunder.obj \
-               tif_tile.obj \
-               tif_version.obj \
-               tif_warning.obj \
-               tif_win32.obj \
-               tif_write.obj \
-               tif_zip.obj \
 
+WXWIN=..\..
+LIBTARGET=tiff
+
+!include ..\makeb32.env
 
+OBJECTS= \
+               $(OBJ_PATH)\tif_aux.obj \
+               $(OBJ_PATH)\tif_close.obj \
+               $(OBJ_PATH)\tif_codec.obj \
+               $(OBJ_PATH)\tif_compress.obj \
+               $(OBJ_PATH)\tif_dir.obj \
+               $(OBJ_PATH)\tif_dirinfo.obj \
+               $(OBJ_PATH)\tif_dirread.obj \
+               $(OBJ_PATH)\tif_dirwrite.obj \
+               $(OBJ_PATH)\tif_dumpmode.obj \
+               $(OBJ_PATH)\tif_error.obj \
+               $(OBJ_PATH)\tif_fax3.obj \
+               $(OBJ_PATH)\tif_fax3sm.obj \
+               $(OBJ_PATH)\tif_flush.obj \
+               $(OBJ_PATH)\tif_getimage.obj \
+               $(OBJ_PATH)\tif_jpeg.obj \
+               $(OBJ_PATH)\tif_luv.obj \
+               $(OBJ_PATH)\tif_lzw.obj \
+               $(OBJ_PATH)\tif_next.obj \
+               $(OBJ_PATH)\tif_open.obj \
+               $(OBJ_PATH)\tif_packbits.obj \
+               $(OBJ_PATH)\tif_pixarlog.obj \
+               $(OBJ_PATH)\tif_predict.obj \
+               $(OBJ_PATH)\tif_print.obj \
+               $(OBJ_PATH)\tif_read.obj \
+               $(OBJ_PATH)\tif_strip.obj \
+               $(OBJ_PATH)\tif_swab.obj \
+               $(OBJ_PATH)\tif_thunder.obj \
+               $(OBJ_PATH)\tif_tile.obj \
+               $(OBJ_PATH)\tif_version.obj \
+               $(OBJ_PATH)\tif_warning.obj \
+               $(OBJ_PATH)\tif_win32.obj \
+               $(OBJ_PATH)\tif_write.obj \
+               $(OBJ_PATH)\tif_zip.obj \
 
 # Pull in standard variable definitions
 
+$(OBJ_PATH)\tif_aux.obj: tif_aux.c
+
+$(OBJ_PATH)\tif_close.obj: tif_close.c
+
+$(OBJ_PATH)\tif_codec.obj: tif_codec.c
+
+$(OBJ_PATH)\tif_compress.obj: tif_compress.c
+
+$(OBJ_PATH)\tif_dir.obj: tif_dir.c
+
+$(OBJ_PATH)\tif_dirinfo.obj: tif_dirinfo.c
+
+$(OBJ_PATH)\tif_dirread.obj: tif_dirread.c
+
+$(OBJ_PATH)\tif_dirwrite.obj: tif_dirwrite.c
+
+$(OBJ_PATH)\tif_dumpmode.obj: tif_dumpmode.c
+
+$(OBJ_PATH)\tif_error.obj: tif_error.c
+
+$(OBJ_PATH)\tif_fax3.obj: tif_fax3.c
+
+$(OBJ_PATH)\tif_fax3sm.obj: tif_fax3sm.c
+
+$(OBJ_PATH)\tif_flush.obj: tif_flush.c
+
+$(OBJ_PATH)\tif_getimage.obj: tif_getimage.c
+
+$(OBJ_PATH)\tif_jpeg.obj: tif_jpeg.c
+
+$(OBJ_PATH)\tif_luv.obj: tif_luv.c
+
+$(OBJ_PATH)\tif_lzw.obj: tif_lzw.c
+
+$(OBJ_PATH)\tif_next.obj: tif_next.c
+
+$(OBJ_PATH)\tif_open.obj: tif_open.c
+
+$(OBJ_PATH)\tif_packbits.obj: tif_packbits.c
+
+$(OBJ_PATH)\tif_pixarlog.obj: tif_pixarlog.c
+
+$(OBJ_PATH)\tif_predict.obj: tif_predict.c
+
+$(OBJ_PATH)\tif_print.obj: tif_print.c
+
+$(OBJ_PATH)\tif_read.obj: tif_read.c
+
+$(OBJ_PATH)\tif_strip.obj: tif_strip.c
+
+$(OBJ_PATH)\tif_swab.obj: tif_swab.c
+
+$(OBJ_PATH)\tif_thunder.obj: tif_thunder.c
+
+$(OBJ_PATH)\tif_tile.obj: tif_tile.c
+
+$(OBJ_PATH)\tif_version.obj: tif_version.c
+
+$(OBJ_PATH)\tif_warning.obj: tif_warning.c
+
+$(OBJ_PATH)\tif_win32.obj: tif_win32.c
+
+$(OBJ_PATH)\tif_write.obj: tif_write.c
+
+$(OBJ_PATH)\tif_zip.obj: tif_zip.c
+
 !include ..\makelib.b32
 

diff --git a/src/zlib/makefile.b32 b/src/zlib/makefile.b32
index d9da543dab8f9303e37bf8290831eb72feb2570f..4bc39731b2e76c4dc5ef02de8efefead557ec993 100644 (file)
--- a/src/zlib/makefile.b32
+++ b/src/zlib/makefile.b32
@@ -1,5 +1,5 @@
 # Makefile for zlib
-# Borland C++   
+# Borland C++
 
 # This version of the zlib makefile was adapted by Chris Young for use
 # with Borland C 4.5x with the Dos Power Pack for a 32-bit protected mode
@@ -8,17 +8,61 @@
 # switches -WX and -DMSDOS are required.
 # -- Chris Young 76702.1655@compuserve.com
 
+## modified further for 32 bit windows
+
 # To use, do "make -fmakefile.b32"
 
 # See zconf.h for details about the memory requirements.
 
 # ------------- Borland C++ -------------
 
-LIBTARGET=..\..\lib\zlib.lib
 
-OBJECTS = adler32.obj compress.obj crc32.obj gzio.obj uncompr.obj deflate.obj \
-          trees.obj zutil.obj inflate.obj infblock.obj inftrees.obj infcodes.obj \
-          infutil.obj inffast.obj
+WXWIN=..\..
+LIBTARGET=zlib
+
+!include ..\makeb32.env
+
+OBJECTS = $(OBJ_PATH)\adler32.obj \
+       $(OBJ_PATH)\compress.obj \
+       $(OBJ_PATH)\crc32.obj \
+       $(OBJ_PATH)\gzio.obj \
+       $(OBJ_PATH)\uncompr.obj \
+       $(OBJ_PATH)\deflate.obj \
+       $(OBJ_PATH)\trees.obj \
+       $(OBJ_PATH)\zutil.obj \
+       $(OBJ_PATH)\inflate.obj \
+       $(OBJ_PATH)\infblock.obj \
+       $(OBJ_PATH)\inftrees.obj \
+       $(OBJ_PATH)\infcodes.obj \
+       $(OBJ_PATH)\infutil.obj \
+       $(OBJ_PATH)\inffast.obj
+
+$(OBJ_PATH)\adler32.obj: adler32.c
+
+$(OBJ_PATH)\compress.obj: compress.c
+
+$(OBJ_PATH)\crc32.obj: crc32.c
+
+$(OBJ_PATH)\gzio.obj: gzio.c
+
+$(OBJ_PATH)\uncompr.obj: uncompr.c
+
+$(OBJ_PATH)\deflate.obj: deflate.c
+
+$(OBJ_PATH)\trees.obj: trees.c
+
+$(OBJ_PATH)\zutil.obj: zutil.c
+
+$(OBJ_PATH)\inflate.obj: inflate.c
+
+$(OBJ_PATH)\infblock.obj: infblock.c
+
+$(OBJ_PATH)\inftrees.obj: inftrees.c
+
+$(OBJ_PATH)\infcodes.obj: infcodes.c
+
+$(OBJ_PATH)\infutil.obj: infutil.c
 
-!include $(WXWIN)\src\makelib.b32
+$(OBJ_PATH)\inffast.obj: inffast.c
 
+!include ..\makelib.b32