X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c3288a7b682794e4c4a60f2b8487627d0f7c1aa..e58989615283771efcaa9e798568772ef5fcfb0c:/src/msw/makefile.b32 diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index b1ebe96ed7..7623ca7f60 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -24,6 +24,7 @@ WXDIR = $(WXWIN) THISDIR = $(WXDIR)\src\msw + # Set all these to 1 if you want to build a dynamic library !if "$(DLL)" == "1" WXMAKINGDLL=1 @@ -47,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) @@ -56,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_bc$(DEBUG_SUFFIX) png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX) regex_bc$(DEBUG_SUFFIX) !endif LIBTARGET=$(WXLIB) @@ -65,323 +65,468 @@ GENDIR=..\generic COMMDIR=..\common HTMLDIR=..\html OLEDIR=.\ole +UNIVDIR=..\univ +UNIVTHEMEDIR=..\univ\themes 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)\prop.obj \ - $(MSWDIR)\propform.obj \ - $(MSWDIR)\proplist.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)\treelay.obj \ - $(MSWDIR)\wizard.obj - -# Not needed: -# $(MSWDIR)\colrdlgg.obj \ -# $(MSWDIR)\fontdlgg.obj \ -# $(MSWDIR)\msgdlgg.obj \ -# $(MSWDIR)\printps.obj \ -# $(MSWDIR)\prntdlgg.obj \ -# $(MSWDIR)\listctrl.obj \ -# $(MSWDIR)\notebook.obj \ -# $(MSWDIR)\treectrl.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)\selstore.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)\basemsw.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)\utilsgui.obj \ + $(OBJ_PATH)\uuid.obj \ + $(OBJ_PATH)\uxtheme.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)\selstore.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)\basemsw.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)\mslu.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)\utilsgui.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)\y_tab.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)\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)\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)\odbc.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)\resource.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)\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)\wxexpr.obj \ - $(MSWDIR)\xpmdecod.obj \ - $(MSWDIR)\zipstrm.obj \ - $(MSWDIR)\zstream.obj - -MSWOBJS = $(MSWDIR)\accel.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)\curico.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)\dibutils.obj \ - $(MSWDIR)\dir.obj \ - $(MSWDIR)\dirdlg.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 - -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_meta.obj \ - $(MSWDIR)\m_pre.obj \ - $(MSWDIR)\m_style.obj \ - $(MSWDIR)\m_tables.obj \ - $(MSWDIR)\winpars.obj - + $(OBJ_PATH)\accesscmn.obj \ + $(OBJ_PATH)\appbase.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)\fldlgcmn.obj \ + $(OBJ_PATH)\fmapbase.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)\stopwatch.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) +!else OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) +!endif 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 @@ -393,17 +538,21 @@ makesetuph: # Copy include\wx\msw\setup.h to the architecture-specific location makearchsetuph: - copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH) + copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH) cd $(WXDIR)\src\msw +makeoutdir: + -mkdir $(OBJ_PATH) + $(ARCHINCDIR)\wx: -mkdir $(ARCHINCDIR) -mkdir $(ARCHINCDIR)\wx + -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 +) ! @@ -411,8 +560,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) !else $(LIBTARGET): $(DUMMY).obj $(OBJECTS) - -erase $(LIBTARGET) - -erase $(WXDLL) + -$(RM) $(LIBTARGET) + -$(RM) $(WXDLL) $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&! c0d32.obj $(OBJECTS) $(WXDLL) @@ -420,7 +569,7 @@ nul $(PERIPH_LIBS) $(LIBS) wxb32 ! - implib -c $(LIBTARGET) $(WXDLL) + implib -c -f $(LIBTARGET) $(WXDLL) !endif dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h @@ -429,619 +578,936 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ version.res: brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c +# $(OBJECTS): $(WXDIR)\include\wx\setup.h + +!if "$(WXUSINGUNIV)" == "1" +######################################################## +# MSW objects (compile Native or UNIV) - UNIV -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << +$(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF) -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c +$(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c +$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) -# $(OBJECTS): $(WXDIR)\include\wx\setup.h +$(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) + +$(OBJ_PATH)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF) + +$(OBJ_PATH)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF) + +$(OBJ_PATH)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF) + +$(OBJ_PATH)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF) + +$(OBJ_PATH)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF) + +$(OBJ_PATH)\data.obj: $(MSWDIR)\data.$(SRCSUFF) + +$(OBJ_PATH)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF) + +$(OBJ_PATH)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF) + +$(OBJ_PATH)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF) + +$(OBJ_PATH)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF) + +$(OBJ_PATH)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF) + +$(OBJ_PATH)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF) + +$(OBJ_PATH)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF) + +$(OBJ_PATH)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF) + +$(OBJ_PATH)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF) + +$(OBJ_PATH)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF) + +$(OBJ_PATH)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF) + +$(OBJ_PATH)\display.obj: $(MSWDIR)\display.$(SRCSUFF) + +$(OBJ_PATH)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF) + +$(OBJ_PATH)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF) + +$(OBJ_PATH)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF) + +$(OBJ_PATH)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF) + +$(OBJ_PATH)\font.obj: $(MSWDIR)\font.$(SRCSUFF) + +$(OBJ_PATH)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF) + +$(OBJ_PATH)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF) + +$(OBJ_PATH)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF) + +$(OBJ_PATH)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF) + +$(OBJ_PATH)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF) + +$(OBJ_PATH)\gsocket.obj: $(MSWDIR)\gsocket.c + +$(OBJ_PATH)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c + +$(OBJ_PATH)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF) + +$(OBJ_PATH)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF) + +$(OBJ_PATH)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF) + +$(OBJ_PATH)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF) + +$(OBJ_PATH)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF) + +$(OBJ_PATH)\main.obj: $(MSWDIR)\main.$(SRCSUFF) + +$(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) + +$(OBJ_PATH)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) + +$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) + +$(OBJ_PATH)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF) + +$(OBJ_PATH)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) + +$(OBJ_PATH)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF) + +$(OBJ_PATH)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF) + +$(OBJ_PATH)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF) + +$(OBJ_PATH)\region.obj: $(MSWDIR)\region.$(SRCSUFF) + +$(OBJ_PATH)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF) + +$(OBJ_PATH)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF) + +$(OBJ_PATH)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF) + +$(OBJ_PATH)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF) + +$(OBJ_PATH)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF) + +$(OBJ_PATH)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF) + +$(OBJ_PATH)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF) + +$(OBJ_PATH)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF) + +$(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) + +$(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) + +$(OBJ_PATH)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF) + +$(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF) + +$(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) + +$(OBJ_PATH)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF) + +$(OBJ_PATH)\window.obj: $(MSWDIR)\window.$(SRCSUFF) + + + + +!else +######################################################## +# MSW objects (compile Native or UNIV) - Native + +$(OBJ_PATH)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF) + +$(OBJ_PATH)\access.obj: $(OLEDIR)\access.$(SRCSUFF) + +$(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF) + +$(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) + +$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) + +$(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) + +$(OBJ_PATH)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF) + +$(OBJ_PATH)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF) + +$(OBJ_PATH)\button.obj: $(MSWDIR)\button.$(SRCSUFF) + +$(OBJ_PATH)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF) + +$(OBJ_PATH)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF) + +$(OBJ_PATH)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF) + +$(OBJ_PATH)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF) + +$(OBJ_PATH)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF) + +$(OBJ_PATH)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF) + +$(OBJ_PATH)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF) + +$(OBJ_PATH)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF) + +$(OBJ_PATH)\control.obj: $(MSWDIR)\control.$(SRCSUFF) + +$(OBJ_PATH)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF) + +$(OBJ_PATH)\data.obj: $(MSWDIR)\data.$(SRCSUFF) + +$(OBJ_PATH)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF) -$(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF) +$(OBJ_PATH)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF) -$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF) +$(OBJ_PATH)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF) -$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) +$(OBJ_PATH)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF) -$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) +$(OBJ_PATH)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF) -$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF) +$(OBJ_PATH)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF) -$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF) +$(OBJ_PATH)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF) -$(MSWDIR)\button.obj: $(MSWDIR)\button.$(SRCSUFF) +$(OBJ_PATH)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF) -$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF) +$(OBJ_PATH)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF) -$(MSWDIR)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF) +$(OBJ_PATH)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF) -$(MSWDIR)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF) +$(OBJ_PATH)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF) -$(MSWDIR)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF) +$(OBJ_PATH)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF) -$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF) +$(OBJ_PATH)\display.obj: $(MSWDIR)\display.$(SRCSUFF) -$(MSWDIR)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF) +$(OBJ_PATH)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF) -$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF) +$(OBJ_PATH)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF) -$(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF) +$(OBJ_PATH)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF) -$(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF) +$(OBJ_PATH)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF) -$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF) +$(OBJ_PATH)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF) -$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF) +$(OBJ_PATH)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF) -$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF) +$(OBJ_PATH)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF) -$(MSWDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF) +$(OBJ_PATH)\font.obj: $(MSWDIR)\font.$(SRCSUFF) -$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF) +$(OBJ_PATH)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF) -$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF) +$(OBJ_PATH)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF) -$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF) +$(OBJ_PATH)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF) -$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF) +$(OBJ_PATH)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF) -$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF) +$(OBJ_PATH)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF) -$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF) +$(OBJ_PATH)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF) -$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF) +$(OBJ_PATH)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF) -$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF) +$(OBJ_PATH)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF) -$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF) +$(OBJ_PATH)\gsocket.obj: $(MSWDIR)\gsocket.c -$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF) +$(OBJ_PATH)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c -$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF) +$(OBJ_PATH)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF) -$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF) +$(OBJ_PATH)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF) -$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF) +$(OBJ_PATH)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF) -$(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF) +$(OBJ_PATH)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF) -$(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF) +$(OBJ_PATH)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF) -$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF) +$(OBJ_PATH)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF) -$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF) +$(OBJ_PATH)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF) -$(MSWDIR)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF) +$(OBJ_PATH)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF) -$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF) +$(OBJ_PATH)\listctrl.obj: $(MSWDIR)\listctrl.$(SRCSUFF) -$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF) +$(OBJ_PATH)\main.obj: $(MSWDIR)\main.$(SRCSUFF) -$(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF) +$(OBJ_PATH)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF) -$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF) +$(OBJ_PATH)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF) -$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF) +$(OBJ_PATH)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF) -$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF) +$(OBJ_PATH)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF) -$(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF) +$(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) -$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF) +$(OBJ_PATH)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) -$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF) +$(OBJ_PATH)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF) -$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF) +$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) -$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c +$(OBJ_PATH)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF) -$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c +$(OBJ_PATH)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF) -$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF) +$(OBJ_PATH)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF) -$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF) +$(OBJ_PATH)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF) -$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF) +$(OBJ_PATH)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) -$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF) +$(OBJ_PATH)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF) -$(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF) +$(OBJ_PATH)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF) -$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF) +$(OBJ_PATH)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF) -$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF) +$(OBJ_PATH)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF) -$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF) +$(OBJ_PATH)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF) -$(MSWDIR)\listctrl.obj: $(MSWDIR)\listctrl.$(SRCSUFF) +$(OBJ_PATH)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF) -$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF) +$(OBJ_PATH)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF) -$(MSWDIR)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF) +$(OBJ_PATH)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF) -$(MSWDIR)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF) +$(OBJ_PATH)\region.obj: $(MSWDIR)\region.$(SRCSUFF) -$(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF) +$(OBJ_PATH)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF) -$(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF) +$(OBJ_PATH)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF) -$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) +$(OBJ_PATH)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF) -$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) +$(OBJ_PATH)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF) -$(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF) +$(OBJ_PATH)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF) -$(MSWDIR)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) +$(OBJ_PATH)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF) -$(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF) +$(OBJ_PATH)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF) -$(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF) +$(OBJ_PATH)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF) -$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF) +$(OBJ_PATH)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF) -$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF) +$(OBJ_PATH)\statbr95.obj: $(MSWDIR)\statbr95.$(SRCSUFF) -$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) +$(OBJ_PATH)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF) -$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF) +$(OBJ_PATH)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF) -$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF) +$(OBJ_PATH)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF) -$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF) +$(OBJ_PATH)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF) -$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF) +$(OBJ_PATH)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF) -$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF) +$(OBJ_PATH)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF) -$(MSWDIR)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF) +$(OBJ_PATH)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF) -$(MSWDIR)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF) +$(OBJ_PATH)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF) -$(MSWDIR)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF) +$(OBJ_PATH)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF) -$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF) +$(OBJ_PATH)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF) -$(MSWDIR)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF) +$(OBJ_PATH)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF) -$(MSWDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF) +$(OBJ_PATH)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF) -$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF) +$(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) -$(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF) +$(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) -$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF) +$(OBJ_PATH)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF) -$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF) +$(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF) -$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF) +$(OBJ_PATH)\uxtheme.obj: $(MSWDIR)\uxtheme.$(SRCSUFF) -$(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF) +$(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) -$(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF) +$(OBJ_PATH)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF) -$(MSWDIR)\statbr95.obj: $(MSWDIR)\statbr95.$(SRCSUFF) +$(OBJ_PATH)\window.obj: $(MSWDIR)\window.$(SRCSUFF) -$(MSWDIR)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF) -$(MSWDIR)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF) +!endif + +!if "$(WXUSINGUNIV)" == "1" +######################################################## +# UNIV objects +$(OBJ_PATH)\bmpbuttn.obj: $(UNIVDIR)\bmpbuttn.$(SRCSUFF) + +$(OBJ_PATH)\button.obj: $(UNIVDIR)\button.$(SRCSUFF) + +$(OBJ_PATH)\checkbox.obj: $(UNIVDIR)\checkbox.$(SRCSUFF) + +$(OBJ_PATH)\checklst.obj: $(UNIVDIR)\checklst.$(SRCSUFF) + +$(OBJ_PATH)\choice.obj: $(UNIVDIR)\choice.$(SRCSUFF) + +$(OBJ_PATH)\colschem.obj: $(UNIVDIR)\colschem.$(SRCSUFF) + +$(OBJ_PATH)\combobox.obj: $(UNIVDIR)\combobox.$(SRCSUFF) + +$(OBJ_PATH)\control.obj: $(UNIVDIR)\control.$(SRCSUFF) + +$(OBJ_PATH)\dialog.obj: $(UNIVDIR)\dialog.$(SRCSUFF) + +$(OBJ_PATH)\framuniv.obj: $(UNIVDIR)\framuniv.$(SRCSUFF) + +$(OBJ_PATH)\gauge.obj: $(UNIVDIR)\gauge.$(SRCSUFF) + +$(OBJ_PATH)\inpcons.obj: $(UNIVDIR)\inpcons.$(SRCSUFF) + +$(OBJ_PATH)\inphand.obj: $(UNIVDIR)\inphand.$(SRCSUFF) + +$(OBJ_PATH)\listbox.obj: $(UNIVDIR)\listbox.$(SRCSUFF) + +$(OBJ_PATH)\menu.obj: $(UNIVDIR)\menu.$(SRCSUFF) + +$(OBJ_PATH)\notebook.obj: $(UNIVDIR)\notebook.$(SRCSUFF) + +$(OBJ_PATH)\radiobox.obj: $(UNIVDIR)\radiobox.$(SRCSUFF) + +$(OBJ_PATH)\radiobut.obj: $(UNIVDIR)\radiobut.$(SRCSUFF) + +$(OBJ_PATH)\renderer.obj: $(UNIVDIR)\renderer.$(SRCSUFF) + +$(OBJ_PATH)\scrarrow.obj: $(UNIVDIR)\scrarrow.$(SRCSUFF) + +$(OBJ_PATH)\scrolbar.obj: $(UNIVDIR)\scrolbar.$(SRCSUFF) + +$(OBJ_PATH)\scrthumb.obj: $(UNIVDIR)\scrthumb.$(SRCSUFF) -$(MSWDIR)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF) +$(OBJ_PATH)\slider.obj: $(UNIVDIR)\slider.$(SRCSUFF) -$(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF) +$(OBJ_PATH)\spinbutt.obj: $(UNIVDIR)\spinbutt.$(SRCSUFF) -$(MSWDIR)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF) +$(OBJ_PATH)\statbmp.obj: $(UNIVDIR)\statbmp.$(SRCSUFF) -$(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF) +$(OBJ_PATH)\statbox.obj: $(UNIVDIR)\statbox.$(SRCSUFF) -$(MSWDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF) +$(OBJ_PATH)\statline.obj: $(UNIVDIR)\statline.$(SRCSUFF) -$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF) +$(OBJ_PATH)\stattext.obj: $(UNIVDIR)\stattext.$(SRCSUFF) -$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF) +$(OBJ_PATH)\statusbr.obj: $(UNIVDIR)\statusbr.$(SRCSUFF) -$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF) +$(OBJ_PATH)\textctrl.obj: $(UNIVDIR)\textctrl.$(SRCSUFF) -$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF) +$(OBJ_PATH)\theme.obj: $(UNIVDIR)\theme.$(SRCSUFF) -$(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF) +$(OBJ_PATH)\toolbar.obj: $(UNIVDIR)\toolbar.$(SRCSUFF) -$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) +$(OBJ_PATH)\topluniv.obj: $(UNIVDIR)\topluniv.$(SRCSUFF) -$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) +$(OBJ_PATH)\winuniv.obj: $(UNIVDIR)\winuniv.$(SRCSUFF) -$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF) -$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) -$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF) -$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) +######################################################## +# UNIV THEME objects + +$(OBJ_PATH)\gtk.obj: $(UNIVTHEMEDIR)\gtk.$(SRCSUFF) + +$(OBJ_PATH)\metal.obj: $(UNIVTHEMEDIR)\metal.$(SRCSUFF) +$(OBJ_PATH)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF) + +!endif + ######################################################## # Common objects (always compiled) -$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(OBJ_PATH)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF) + +$(OBJ_PATH)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF) + +$(OBJ_PATH)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) + +$(OBJ_PATH)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) + +$(OBJ_PATH)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF) + +$(OBJ_PATH)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) + +$(OBJ_PATH)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) -$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) +$(OBJ_PATH)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF) -$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF) +$(OBJ_PATH)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF) -$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) +$(OBJ_PATH)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF) -$(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) +$(OBJ_PATH)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF) -$(MSWDIR)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF) +$(OBJ_PATH)\config.obj: $(COMMDIR)\config.$(SRCSUFF) -$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF) +$(OBJ_PATH)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF) -$(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF) +$(OBJ_PATH)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF) -$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF) +$(OBJ_PATH)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF) -$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF) +$(OBJ_PATH)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) -$(MSWDIR)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF) +$(OBJ_PATH)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF) -$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF) +$(OBJ_PATH)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) -$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF) +$(OBJ_PATH)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) -$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) +$(OBJ_PATH)\db.obj: $(COMMDIR)\db.$(SRCSUFF) -$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) +$(OBJ_PATH)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF) -$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) +$(OBJ_PATH)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF) -$(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF) +$(OBJ_PATH)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF) -$(MSWDIR)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF) +$(OBJ_PATH)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF) -$(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF) +$(OBJ_PATH)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF) -$(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF) +$(OBJ_PATH)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF) -$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF) +$(OBJ_PATH)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF) -$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF) +$(OBJ_PATH)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF) -$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF) +$(OBJ_PATH)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF) -$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF) +$(OBJ_PATH)\dpycmn.obj: $(COMMDIR)\dpycmn.$(SRCSUFF) -$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF) +$(OBJ_PATH)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF) -$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF) +$(OBJ_PATH)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF) -$(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF) +$(OBJ_PATH)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF) -$(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF) +$(OBJ_PATH)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF) -$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF) +$(OBJ_PATH)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF) -$(MSWDIR)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF) +$(OBJ_PATH)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF) -$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF) +$(OBJ_PATH)\event.obj: $(COMMDIR)\event.$(SRCSUFF) -$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF) +$(OBJ_PATH)\extended.obj: $(COMMDIR)\extended.c -$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF) +$(OBJ_PATH)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF) -$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c +$(OBJ_PATH)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF) -$(MSWDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF) +$(OBJ_PATH)\file.obj: $(COMMDIR)\file.$(SRCSUFF) -$(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF) +$(OBJ_PATH)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF) -$(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF) +$(OBJ_PATH)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF) -$(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF) +$(OBJ_PATH)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF) -$(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF) +$(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF) -$(MSWDIR)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF) +$(OBJ_PATH)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF) -$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF) +$(OBJ_PATH)\fmapbase.obj: $(COMMDIR)\fmapbase.$(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)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF) +$(OBJ_PATH)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF) -$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF) +$(OBJ_PATH)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF) -$(MSWDIR)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF) +$(OBJ_PATH)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF) -$(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF) +$(OBJ_PATH)\process.obj: $(COMMDIR)\process.$(SRCSUFF) -$(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF) +$(OBJ_PATH)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF) -$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF) +$(OBJ_PATH)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF) -$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF) +$(OBJ_PATH)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF) -$(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF) +$(OBJ_PATH)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF) -$(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF) +$(OBJ_PATH)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF) -$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF) +$(OBJ_PATH)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF) -$(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF) +$(OBJ_PATH)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF) -$(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF) +$(OBJ_PATH)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF) -$(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF) +$(OBJ_PATH)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF) -$(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF) +$(OBJ_PATH)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF) -$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF) +$(OBJ_PATH)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF) -$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF) +$(OBJ_PATH)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) -$(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) +$(OBJ_PATH)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF) -$(MSWDIR)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF) +$(OBJ_PATH)\stopwatch.obj: $(COMMDIR)\stopwatch.$(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)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF) +$(OBJ_PATH)\taskbarcmn.obj: $(COMMDIR)\taskbarcmn.$(SRCSUFF) -$(MSWDIR)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF) +$(OBJ_PATH)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF) -$(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF) +$(OBJ_PATH)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF) -$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF) +$(OBJ_PATH)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF) -$(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF) +$(OBJ_PATH)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF) -$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF) +$(OBJ_PATH)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF) -$(MSWDIR)\toplvcmn.obj: $(COMMDIR)\toplvcmn.$(SRCSUFF) +$(OBJ_PATH)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF) -$(MSWDIR)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF) +$(OBJ_PATH)\toplvcmn.obj: $(COMMDIR)\toplvcmn.$(SRCSUFF) -$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF) +$(OBJ_PATH)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF) -$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c +$(OBJ_PATH)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF) -$(MSWDIR)\url.obj: $(COMMDIR)\url.$(SRCSUFF) +$(OBJ_PATH)\unzip.obj: $(COMMDIR)\unzip.c -$(MSWDIR)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF) +$(OBJ_PATH)\url.obj: $(COMMDIR)\url.$(SRCSUFF) -$(MSWDIR)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF) +$(OBJ_PATH)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF) -$(MSWDIR)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF) +$(OBJ_PATH)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF) -$(MSWDIR)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF) +$(OBJ_PATH)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF) -$(MSWDIR)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF) +$(OBJ_PATH)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF) -$(MSWDIR)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF) +$(OBJ_PATH)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF) -$(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF) +$(OBJ_PATH)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF) -$(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF) +$(OBJ_PATH)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF) -$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(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) +!if "$(WXUSINGUNIV)" == "1" ######################################################## # Generic objects (not always compiled, depending on # whether platforms have native implementations) +# Native -$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF) -$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF) +$(OBJ_PATH)\accel.obj: $(GENDIR)\accel.$(SRCSUFF) -$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF) +$(OBJ_PATH)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF) -$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF) +$(OBJ_PATH)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF) -$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF) +$(OBJ_PATH)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF) -$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF) +$(OBJ_PATH)\colrdlgg.obj: $(GENDIR)\colrdlgg.$(SRCSUFF) -$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF) +$(OBJ_PATH)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF) -$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF) +$(OBJ_PATH)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF) -$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF) +$(OBJ_PATH)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF) -$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF) +$(OBJ_PATH)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF) -$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF) +$(OBJ_PATH)\fdrepdlg.obj: $(GENDIR)\fdrepdlg.$(SRCSUFF) -$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF) +$(OBJ_PATH)\filedlgg.obj: $(GENDIR)\filedlgg.$(SRCSUFF) -$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF) +$(OBJ_PATH)\fontdlgg.obj: $(GENDIR)\fontdlgg.$(SRCSUFF) -$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF) +$(OBJ_PATH)\grid.obj: $(GENDIR)\grid.$(SRCSUFF) -$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF) +$(OBJ_PATH)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF) -$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF) +$(OBJ_PATH)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF) -$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF) +$(OBJ_PATH)\helpext.obj: $(GENDIR)\helpext.$(SRCSUFF) -$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF) +$(OBJ_PATH)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF) -$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) +$(OBJ_PATH)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF) -$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) +$(OBJ_PATH)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF) -$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) +$(OBJ_PATH)\logg.obj: $(GENDIR)\logg.$(SRCSUFF) -$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) +$(OBJ_PATH)\mdig.obj: $(GENDIR)\mdig.$(SRCSUFF) -$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF) +$(OBJ_PATH)\msgdlgg.obj: $(GENDIR)\msgdlgg.$(SRCSUFF) -$(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF) +$(OBJ_PATH)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF) -$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) +$(OBJ_PATH)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF) -$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) +$(OBJ_PATH)\printps.obj: $(GENDIR)\printps.$(SRCSUFF) -$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF) +$(OBJ_PATH)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF) -$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF) +$(OBJ_PATH)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF) -$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) +$(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) -$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF) +$(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) -$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) +$(OBJ_PATH)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF) +$(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) +$(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) +$(OBJ_PATH)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF) + +$(OBJ_PATH)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF) + +$(OBJ_PATH)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) + +$(OBJ_PATH)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) + +$(OBJ_PATH)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF) + +$(OBJ_PATH)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF) + +$(OBJ_PATH)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) + +$(OBJ_PATH)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) + + + +!else ######################################################## -# HTML objects (always compiled) +# Generic objects (not always compiled, depending on +# whether platforms have native implementations) +# Native + +$(OBJ_PATH)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF) + +$(OBJ_PATH)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF) + +$(OBJ_PATH)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF) + +$(OBJ_PATH)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF) + +$(OBJ_PATH)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF) + +$(OBJ_PATH)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF) + +$(OBJ_PATH)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF) + +$(OBJ_PATH)\grid.obj: $(GENDIR)\grid.$(SRCSUFF) + +$(OBJ_PATH)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF) + +$(OBJ_PATH)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF) + +$(OBJ_PATH)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF) + +$(OBJ_PATH)\logg.obj: $(GENDIR)\logg.$(SRCSUFF) + +$(OBJ_PATH)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF) + +$(OBJ_PATH)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF) + +$(OBJ_PATH)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF) + +$(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) + +$(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) + +$(OBJ_PATH)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF) + +$(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) + +$(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) + +$(OBJ_PATH)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF) + +$(OBJ_PATH)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF) -$(MSWDIR)\helpctrl.obj: $(HTMLDIR)\helpctrl.$(SRCSUFF) +$(OBJ_PATH)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) -$(MSWDIR)\helpdata.obj: $(HTMLDIR)\helpdata.$(SRCSUFF) +$(OBJ_PATH)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) -$(MSWDIR)\helpfrm.obj: $(HTMLDIR)\helpfrm.$(SRCSUFF) +$(OBJ_PATH)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF) -$(MSWDIR)\htmlcell.obj: $(HTMLDIR)\htmlcell.$(SRCSUFF) +$(OBJ_PATH)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF) -$(MSWDIR)\htmlfilt.obj: $(HTMLDIR)\htmlfilt.$(SRCSUFF) +$(OBJ_PATH)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) -$(MSWDIR)\htmlpars.obj: $(HTMLDIR)\htmlpars.$(SRCSUFF) +$(OBJ_PATH)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) -$(MSWDIR)\htmltag.obj: $(HTMLDIR)\htmltag.$(SRCSUFF) -$(MSWDIR)\htmlwin.obj: $(HTMLDIR)\htmlwin.$(SRCSUFF) +!endif + +######################################################## +# HTML objects (always compiled) + +$(OBJ_PATH)\helpctrl.obj: $(HTMLDIR)\helpctrl.$(SRCSUFF) + +$(OBJ_PATH)\helpdata.obj: $(HTMLDIR)\helpdata.$(SRCSUFF) -$(MSWDIR)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF) +$(OBJ_PATH)\helpfrm.obj: $(HTMLDIR)\helpfrm.$(SRCSUFF) -$(MSWDIR)\m_dflist.obj: $(HTMLDIR)\m_dflist.$(SRCSUFF) +$(OBJ_PATH)\htmlcell.obj: $(HTMLDIR)\htmlcell.$(SRCSUFF) -$(MSWDIR)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF) +$(OBJ_PATH)\htmlfilt.obj: $(HTMLDIR)\htmlfilt.$(SRCSUFF) -$(MSWDIR)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF) +$(OBJ_PATH)\htmlpars.obj: $(HTMLDIR)\htmlpars.$(SRCSUFF) -$(MSWDIR)\m_image.obj: $(HTMLDIR)\m_image.$(SRCSUFF) +$(OBJ_PATH)\htmltag.obj: $(HTMLDIR)\htmltag.$(SRCSUFF) -$(MSWDIR)\m_layout.obj: $(HTMLDIR)\m_layout.$(SRCSUFF) +$(OBJ_PATH)\htmlwin.obj: $(HTMLDIR)\htmlwin.$(SRCSUFF) -$(MSWDIR)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF) +$(OBJ_PATH)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF) -$(MSWDIR)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF) +$(OBJ_PATH)\m_dflist.obj: $(HTMLDIR)\m_dflist.$(SRCSUFF) -$(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(SRCSUFF) +$(OBJ_PATH)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF) -$(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF) +$(OBJ_PATH)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF) -$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF) +$(OBJ_PATH)\m_image.obj: $(HTMLDIR)\m_image.$(SRCSUFF) -$(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF) +$(OBJ_PATH)\m_layout.obj: $(HTMLDIR)\m_layout.$(SRCSUFF) -$(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF) +$(OBJ_PATH)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF) + +$(OBJ_PATH)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF) + +$(OBJ_PATH)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF) + +$(OBJ_PATH)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF) + +$(OBJ_PATH)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF) + +$(OBJ_PATH)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF) @@ -1063,58 +1529,58 @@ all_execs: png: $(CFG) cd $(WXDIR)\src\png - ${MAKE} -f makefile.b32 + ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib cd $(WXDIR)\src\msw clean_png: cd $(WXDIR)\src\png - ${MAKE} -f makefile.b32 clean + ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean cd $(WXDIR)\src\msw zlib: $(CFG) cd $(WXDIR)\src\zlib - ${MAKE} -f makefile.b32 lib + ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib cd $(WXDIR)\src\msw clean_zlib: cd $(WXDIR)\src\zlib - ${MAKE} -f makefile.b32 clean + ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean cd $(WXDIR)\src\msw jpeg: $(CFG) cd $(WXDIR)\src\jpeg - ${MAKE} -f makefile.b32 + ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib cd $(WXDIR)\src\msw clean_jpeg: cd $(WXDIR)\src\jpeg - ${MAKE} -f makefile.b32 clean + ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean cd $(WXDIR)\src\msw regex: $(CFG) cd $(WXDIR)\src\regex - ${MAKE} -f makefile.b32 lib + ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib cd $(WXDIR)\src\msw clean_regex: cd $(WXDIR)\src\regex - ${MAKE} -f makefile.b32 clean + ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean cd $(WXDIR)\src\msw tiff: $(CFG) cd $(WXDIR)\src\tiff - ${MAKE} -f makefile.b32 lib + ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib cd $(WXDIR)\src\msw clean_tiff: cd $(WXDIR)\src\tiff - ${MAKE} -f makefile.b32 clean + ${MAKE} -f makefile.b32 $(MAKEFLAGS) 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 @@ -1130,7 +1596,7 @@ $(CFG): makefile.b32 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -D__WXWIN__ --D__WXMSW__ +-D$(PORT) -D__WINDOWS__ -DWIN32 $(OPT) @@ -1138,17 +1604,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.#??" - -erase ..\common\y_tab.c - -erase ..\common\lex_yy.c + -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 @@ -1156,20 +1626,15 @@ docs: allhlp allhtml allpdfrtf alldocs: docs hlp: wxhlp portinghlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -prophlp: $(DOCDIR)/winhelp/prop.hlp refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf -proprtf: $(DOCDIR)/winhelp/prop.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -proppdfrtf: $(DOCDIR)/pdf/prop.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf html: wxhtml portinghtml wxhtml: $(DOCDIR)\html\wx\wx.htm htmlhelp: $(DOCDIR)\html\wx\wx.chm -prophtml: $(DOCDIR)\html\proplist\prop.htm ps: wxps referencps wxps: $(WXDIR)\docs\ps\wx.ps -propps: $(WXDIR)\docs\ps\prop.ps referencps: $(WXDIR)\docs\ps\referenc.ps portinghtml: $(DOCDIR)\html\porting\port.htm @@ -1178,7 +1643,7 @@ portinghlp: $(DOCDIR)/winhelp/porting.hlp portingpdfrtf: $(DOCDIR)/pdf/porting.rtf portingps: $(WXDIR)\docs\ps\porting.ps -allhlp: wxhlp portinghlp prophlp +allhlp: wxhlp portinghlp cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 hlp cd $(THISDIR) @@ -1198,7 +1663,7 @@ allhlp: wxhlp portinghlp prophlp # cd $(WXDIR)\utils\wxgrid\src # ${MAKE} -f makefile.b32 hlp -allhtml: wxhtml portinghtml prophtml +allhtml: wxhtml portinghtml cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 html cd $(THISDIR) @@ -1219,12 +1684,12 @@ allhtml: wxhtml portinghtml prophtml # cd $(WXDIR)\utils\wxtree\src # ${MAKE} -f makefile.b32 html -allps: wxps referencps portingps propps +allps: wxps referencps portingps cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 ps cd $(THISDIR) -allpdfrtf: pdfrtf portingpdfrtf proppdfrtf +allpdfrtf: pdfrtf portingpdfrtf cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 pdfrtf cd $(THISDIR) @@ -1243,7 +1708,7 @@ allpdfrtf: pdfrtf portingpdfrtf proppdfrtf $(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 @@ -1251,23 +1716,15 @@ $(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 cd $(THISDIR) -$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj - cd $(DOCDIR)/latex/proplist - -erase prop.ph - hc prop - move prop.hlp $(DOCDIR)\winhelp\prop.hlp - move prop.cnt $(DOCDIR)\winhelp\prop.cnt - cd $(THISDIR) - $(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 @@ -1283,11 +1740,6 @@ $(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp cd $(THISDIR) -$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp - cd $(THISDIR) - $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp @@ -1307,13 +1759,6 @@ $(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf - cd $(THISDIR) - $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -copy *.wmf $(DOCDIR)\pdf @@ -1325,10 +1770,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 @@ -1341,20 +1786,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 - cd $(THISDIR) - -$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex - cd $(DOCDIR)\latex\proplist - -mkdir $(DOCDIR)\html\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html - -erase $(DOCDIR)\html\proplist\*.con - -erase $(DOCDIR)\html\proplist\*.ref - -erase $(DOCDIR)\latex\proplist\*.con - -erase $(DOCDIR)\latex\proplist\*.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 @@ -1422,6 +1857,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