From 9818fdf902b06524e76966ca4676ca929f7c07c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 2 Aug 2003 01:14:10 +0000 Subject: [PATCH] added wxAdvanced git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 848 ++++++++------- build/makefile.bcc | 449 ++++---- build/makefile.gcc | 549 ++++------ build/makefile.vc | 654 ++++++------ build/makefile.wat | 562 +++++----- build/wx.dsw | 48 + build/wx_advdll.dsp | 394 +++++++ build/wx_advlib.dsp | 377 +++++++ build/wx_basedll.dsp | 32 +- build/wx_baselib.dsp | 263 +++-- build/wx_coredll.dsp | 152 +-- build/wx_corelib.dsp | 2394 ++++++++++++++++++++---------------------- build/wx_gldll.dsp | 32 +- build/wx_gllib.dsp | 172 +-- build/wx_htmldll.dsp | 32 +- build/wx_htmllib.dsp | 172 +-- build/wx_netdll.dsp | 32 +- build/wx_netlib.dsp | 172 +-- build/wx_wxexpat.dsp | 284 ++--- build/wx_wxjpeg.dsp | 284 ++--- build/wx_wxpng.dsp | 284 ++--- build/wx_wxregex.dsp | 284 ++--- build/wx_wxtiff.dsp | 284 ++--- build/wx_wxzlib.dsp | 284 ++--- build/wx_xmldll.dsp | 32 +- build/wx_xmllib.dsp | 172 +-- wx-config.in | 2 +- 27 files changed, 4832 insertions(+), 4412 deletions(-) create mode 100644 build/wx_advdll.dsp create mode 100644 build/wx_advlib.dsp diff --git a/Makefile.in b/Makefile.in index 900c2261b7..cd1a3fc255 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,6 +50,182 @@ top_srcdir = @top_srcdir@ ### Variables: ### +ADVDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) $(PIC_FLAG) +ADVDLL_OBJECTS = \ + advdll_dbgrid.o \ + advdll_calctrl.o \ + advdll_dcbuffer.o \ + advdll_grid.o \ + advdll_gridctrl.o \ + advdll_gridsel.o \ + advdll_helpext.o \ + advdll_laywin.o \ + advdll_sashwin.o \ + advdll_splash.o \ + advdll_tipdlg.o \ + advdll_wizard.o +ADVLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CXXFLAGS) +ADVLIB_OBJECTS = \ + advlib_dbgrid.o \ + advlib_calctrl.o \ + advlib_dcbuffer.o \ + advlib_grid.o \ + advlib_gridctrl.o \ + advlib_gridsel.o \ + advlib_helpext.o \ + advlib_laywin.o \ + advlib_sashwin.o \ + advlib_splash.o \ + advlib_tipdlg.o \ + advlib_wizard.o +ALL_HEADERS = \ + wx/app.h \ + wx/apptrait.h \ + wx/arrimpl.cpp \ + wx/arrstr.h \ + wx/beforestd.h \ + wx/buffer.h \ + wx/build.h \ + wx/chkconf.h \ + wx/clntdata.h \ + wx/cmdline.h \ + wx/confbase.h \ + wx/config.h \ + wx/containr.h \ + wx/datetime.h \ + wx/datetime.inl \ + wx/datstrm.h \ + wx/db.h \ + wx/dbkeyg.h \ + wx/dbtable.h \ + wx/dde.h \ + wx/debug.h \ + wx/defs.h \ + wx/dir.h \ + wx/dynarray.h \ + wx/dynlib.h \ + wx/dynload.h \ + wx/encconv.h \ + wx/event.h \ + wx/features.h \ + wx/ffile.h \ + wx/file.h \ + wx/fileconf.h \ + wx/filefn.h \ + wx/filename.h \ + wx/filesys.h \ + wx/fontenc.h \ + wx/fontmap.h \ + wx/fs_mem.h \ + wx/fs_zip.h \ + wx/hash.h \ + wx/hashmap.h \ + wx/iconloc.h \ + wx/init.h \ + wx/intl.h \ + wx/iosfwrap.h \ + wx/ioswrap.h \ + wx/ipc.h \ + wx/ipcbase.h \ + wx/isql.h \ + wx/isqlext.h \ + wx/list.h \ + wx/listimpl.cpp \ + wx/log.h \ + wx/longlong.h \ + wx/math.h \ + wx/memconf.h \ + wx/memory.h \ + wx/memtext.h \ + wx/mimetype.h \ + wx/module.h \ + wx/msgout.h \ + wx/msgout.h \ + wx/mstream.h \ + wx/object.h \ + wx/platform.h \ + wx/process.h \ + wx/regex.h \ + wx/snglinst.h \ + wx/stopwatch.h \ + wx/strconv.h \ + wx/stream.h \ + wx/string.h \ + wx/sysopt.h \ + wx/textbuf.h \ + wx/textfile.h \ + wx/thread.h \ + wx/thrimpl.cpp \ + wx/tokenzr.h \ + wx/txtstrm.h \ + wx/types.h \ + wx/utils.h \ + wx/variant.h \ + wx/vector.h \ + wx/version.h \ + wx/volume.h \ + wx/wfstream.h \ + wx/wx.h \ + wx/wxchar.h \ + wx/wxprec.h \ + wx/zipstrm.h \ + wx/zstream.h \ + $(BASE_PLATFORM_HDR) \ + wx/fs_inet.h \ + wx/gsocket.h \ + wx/protocol/file.h \ + wx/protocol/ftp.h \ + wx/protocol/http.h \ + wx/protocol/protocol.h \ + wx/sckaddr.h \ + wx/sckipc.h \ + wx/sckstrm.h \ + wx/socket.h \ + wx/url.h \ + $(NET_PLATFORM_HDR) \ + $(ALL_GUI_HEADERS) \ + wx/calctrl.h \ + wx/dbgrid.h \ + wx/dcbuffer.h \ + wx/generic/calctrl.h \ + wx/generic/grid.h \ + wx/generic/gridctrl.h \ + wx/generic/gridsel.h \ + wx/generic/helpext.h \ + wx/generic/laywin.h \ + wx/generic/sashwin.h \ + wx/generic/splash.h \ + wx/generic/wizard.h \ + wx/grid.h \ + wx/laywin.h \ + wx/sashwin.h \ + wx/splash.h \ + wx/tipdlg.h \ + wx/wizard.h \ + wx/html/forcelnk.h \ + wx/html/helpctrl.h \ + wx/html/helpdata.h \ + wx/html/helpfrm.h \ + wx/html/htmlcell.h \ + wx/html/htmldefs.h \ + wx/html/htmlfilt.h \ + wx/html/htmlpars.h \ + wx/html/htmlproc.h \ + wx/html/htmltag.h \ + wx/html/htmlwin.h \ + wx/html/htmprint.h \ + wx/html/m_templ.h \ + wx/html/winpars.h \ + wx/wxhtml.h \ + wx/htmllbox.h \ + wx/xml/xml.h \ + $(OPENGL_HDR) BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ @@ -662,39 +838,32 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/dcscreen.h \ wx/dialog.h \ wx/dirdlg.h \ + wx/dragimag.h \ wx/filedlg.h \ wx/frame.h \ wx/gauge.h \ wx/gdicmn.h \ wx/generic/accel.h \ - wx/generic/calctrl.h \ wx/generic/choicdgg.h \ wx/generic/colrdlgg.h \ wx/generic/dcpsg.h \ wx/generic/dirctrlg.h \ + wx/generic/dragimgg.h \ wx/generic/filedlgg.h \ wx/generic/fontdlgg.h \ - wx/generic/grid.h \ - wx/generic/grid.h \ - wx/generic/gridctrl.h \ - wx/generic/helpext.h \ wx/generic/imaglist.h \ - wx/generic/laywin.h \ wx/generic/logg.h \ wx/generic/msgdlgg.h \ wx/generic/notebook.h \ wx/generic/panelg.h \ wx/generic/prntdlgg.h \ wx/generic/progdlgg.h \ - wx/generic/sashwin.h \ wx/generic/scrolwin.h \ wx/generic/spinctlg.h \ - wx/generic/splash.h \ wx/generic/splitter.h \ wx/generic/textdlgg.h \ wx/generic/timer.h \ wx/generic/treectlg.h \ - wx/generic/wizard.h \ wx/helphtml.h \ wx/icon.h \ wx/layout.h \ @@ -732,7 +901,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/artprov.h \ wx/bitmap.h \ wx/busyinfo.h \ - wx/calctrl.h \ wx/caret.h \ wx/clipbrd.h \ wx/cmdproc.h \ @@ -740,8 +908,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/colour.h \ wx/cshelp.h \ wx/dataobj.h \ - wx/dbgrid.h \ - wx/dcbuffer.h \ wx/dcmirror.h \ wx/dcps.h \ wx/dialup.h \ @@ -750,7 +916,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/dnd.h \ wx/docmdi.h \ wx/docview.h \ - wx/dragimag.h \ wx/effects.h \ wx/evtloop.h \ wx/fdrepdlg.h \ @@ -763,7 +928,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/geometry.h \ wx/gifdecod.h \ wx/glcanvas.h \ - wx/grid.h \ wx/help.h \ wx/helpbase.h \ wx/helpwin.h \ @@ -780,7 +944,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/imagtiff.h \ wx/imagxpm.h \ wx/joystick.h \ - wx/laywin.h \ wx/listbase.h \ wx/listctrl.h \ wx/matrix.h \ @@ -799,11 +962,9 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/quantize.h \ wx/rawbmp.h \ wx/region.h \ - wx/sashwin.h \ wx/scopeguard.h \ wx/spinbutt.h \ wx/spinctrl.h \ - wx/splash.h \ wx/splitter.h \ wx/stack.h \ wx/statline.h \ @@ -813,7 +974,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/tbarbase.h \ wx/tbarsmpl.h \ wx/tglbtn.h \ - wx/tipdlg.h \ wx/tipwin.h \ wx/tooltip.h \ wx/toplevel.h \ @@ -824,11 +984,8 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/vms_x_fix.h \ wx/vscroll.h \ wx/wave.h \ - wx/wizard.h \ wx/xpmdecod.h \ wx/xpmhand.h \ - wx/generic/dragimgg.h \ - wx/generic/gridsel.h \ $(LOWLEVEL_HDR) \ $(GUI_HDR) @COND_USE_GUI_1_WXUNIV_0@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS) @@ -852,39 +1009,32 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/dcscreen.h \ wx/dialog.h \ wx/dirdlg.h \ + wx/dragimag.h \ wx/filedlg.h \ wx/frame.h \ wx/gauge.h \ wx/gdicmn.h \ wx/generic/accel.h \ - wx/generic/calctrl.h \ wx/generic/choicdgg.h \ wx/generic/colrdlgg.h \ wx/generic/dcpsg.h \ wx/generic/dirctrlg.h \ + wx/generic/dragimgg.h \ wx/generic/filedlgg.h \ wx/generic/fontdlgg.h \ - wx/generic/grid.h \ - wx/generic/grid.h \ - wx/generic/gridctrl.h \ - wx/generic/helpext.h \ wx/generic/imaglist.h \ - wx/generic/laywin.h \ wx/generic/logg.h \ wx/generic/msgdlgg.h \ wx/generic/notebook.h \ wx/generic/panelg.h \ wx/generic/prntdlgg.h \ wx/generic/progdlgg.h \ - wx/generic/sashwin.h \ wx/generic/scrolwin.h \ wx/generic/spinctlg.h \ - wx/generic/splash.h \ wx/generic/splitter.h \ wx/generic/textdlgg.h \ wx/generic/timer.h \ wx/generic/treectlg.h \ - wx/generic/wizard.h \ wx/helphtml.h \ wx/icon.h \ wx/layout.h \ @@ -922,7 +1072,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/artprov.h \ wx/bitmap.h \ wx/busyinfo.h \ - wx/calctrl.h \ wx/caret.h \ wx/clipbrd.h \ wx/cmdproc.h \ @@ -930,8 +1079,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/colour.h \ wx/cshelp.h \ wx/dataobj.h \ - wx/dbgrid.h \ - wx/dcbuffer.h \ wx/dcmirror.h \ wx/dcps.h \ wx/dialup.h \ @@ -940,7 +1087,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/dnd.h \ wx/docmdi.h \ wx/docview.h \ - wx/dragimag.h \ wx/effects.h \ wx/evtloop.h \ wx/fdrepdlg.h \ @@ -953,7 +1099,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/geometry.h \ wx/gifdecod.h \ wx/glcanvas.h \ - wx/grid.h \ wx/help.h \ wx/helpbase.h \ wx/helpwin.h \ @@ -970,7 +1115,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/imagtiff.h \ wx/imagxpm.h \ wx/joystick.h \ - wx/laywin.h \ wx/listbase.h \ wx/listctrl.h \ wx/matrix.h \ @@ -989,11 +1133,9 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/quantize.h \ wx/rawbmp.h \ wx/region.h \ - wx/sashwin.h \ wx/scopeguard.h \ wx/spinbutt.h \ wx/spinctrl.h \ - wx/splash.h \ wx/splitter.h \ wx/stack.h \ wx/statline.h \ @@ -1003,7 +1145,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/tbarbase.h \ wx/tbarsmpl.h \ wx/tglbtn.h \ - wx/tipdlg.h \ wx/tipwin.h \ wx/tooltip.h \ wx/toplevel.h \ @@ -1014,11 +1155,8 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/vms_x_fix.h \ wx/vscroll.h \ wx/wave.h \ - wx/wizard.h \ wx/xpmdecod.h \ wx/xpmhand.h \ - wx/generic/dragimgg.h \ - wx/generic/gridsel.h \ $(LOWLEVEL_HDR) \ wx/generic/accel.h \ wx/generic/dirdlgg.h \ @@ -1909,7 +2047,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_ctrlcmn.o \ monodll_ctrlsub.o \ monodll_datacmn.o \ - monodll_dbgrid.o \ monodll_dcbase.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ @@ -1968,36 +2105,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_wincmn.o \ monodll_xpmdecod.o \ monodll_busyinfo.o \ - monodll_calctrl.o \ monodll_choicdgg.o \ - monodll_dcbuffer.o \ monodll_dcpsg.o \ monodll_dirctrlg.o \ monodll_dragimgg.o \ - monodll_grid.o \ - monodll_gridctrl.o \ - monodll_gridsel.o \ - monodll_helpext.o \ - monodll_laywin.o \ monodll_logg.o \ monodll_numdlgg.o \ monodll_panelg.o \ monodll_progdlgg.o \ monodll_renderg.o \ - monodll_sashwin.o \ monodll_scrlwing.o \ monodll_selstore.o \ monodll_spinctlg.o \ - monodll_splash.o \ monodll_splitter.o \ monodll_tbarsmpl.o \ monodll_textdlgg.o \ - monodll_tipdlg.o \ monodll_tipwin.o \ monodll_treectlg.o \ monodll_vlbox.o \ - monodll_vscroll.o \ - monodll_wizard.o + monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS) \ @@ -2022,6 +2148,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_colschem.o \ monodll_combobox.o \ monodll_control.o \ + monodll_ctrlrend.o \ monodll_dialog.o \ monodll_framuniv.o \ monodll_gauge.o \ @@ -2032,7 +2159,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_notebook.o \ monodll_radiobox.o \ monodll_radiobut.o \ - monodll_renderer.o \ monodll_scrarrow.o \ monodll_scrolbar.o \ monodll_scrthumb.o \ @@ -2064,7 +2190,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_ctrlcmn.o \ monodll_ctrlsub.o \ monodll_datacmn.o \ - monodll_dbgrid.o \ monodll_dcbase.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ @@ -2123,36 +2248,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_wincmn.o \ monodll_xpmdecod.o \ monodll_busyinfo.o \ - monodll_calctrl.o \ monodll_choicdgg.o \ - monodll_dcbuffer.o \ monodll_dcpsg.o \ monodll_dirctrlg.o \ monodll_dragimgg.o \ - monodll_grid.o \ - monodll_gridctrl.o \ - monodll_gridsel.o \ - monodll_helpext.o \ - monodll_laywin.o \ monodll_logg.o \ monodll_numdlgg.o \ monodll_panelg.o \ monodll_progdlgg.o \ monodll_renderg.o \ - monodll_sashwin.o \ monodll_scrlwing.o \ monodll_selstore.o \ monodll_spinctlg.o \ - monodll_splash.o \ monodll_splitter.o \ monodll_tbarsmpl.o \ monodll_textdlgg.o \ - monodll_tipdlg.o \ monodll_tipwin.o \ monodll_treectlg.o \ monodll_vlbox.o \ - monodll_vscroll.o \ - monodll_wizard.o + monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_9) \ @@ -2171,7 +2285,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_ctrlcmn.o \ monolib_ctrlsub.o \ monolib_datacmn.o \ - monolib_dbgrid.o \ monolib_dcbase.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ @@ -2230,36 +2343,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_wincmn.o \ monolib_xpmdecod.o \ monolib_busyinfo.o \ - monolib_calctrl.o \ monolib_choicdgg.o \ - monolib_dcbuffer.o \ monolib_dcpsg.o \ monolib_dirctrlg.o \ monolib_dragimgg.o \ - monolib_grid.o \ - monolib_gridctrl.o \ - monolib_gridsel.o \ - monolib_helpext.o \ - monolib_laywin.o \ monolib_logg.o \ monolib_numdlgg.o \ monolib_panelg.o \ monolib_progdlgg.o \ monolib_renderg.o \ - monolib_sashwin.o \ monolib_scrlwing.o \ monolib_selstore.o \ monolib_spinctlg.o \ - monolib_splash.o \ monolib_splitter.o \ monolib_tbarsmpl.o \ monolib_textdlgg.o \ - monolib_tipdlg.o \ monolib_tipwin.o \ monolib_treectlg.o \ monolib_vlbox.o \ - monolib_vscroll.o \ - monolib_wizard.o + monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_9) \ @@ -2284,6 +2386,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_colschem.o \ monolib_combobox.o \ monolib_control.o \ + monolib_ctrlrend.o \ monolib_dialog.o \ monolib_framuniv.o \ monolib_gauge.o \ @@ -2294,7 +2397,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_notebook.o \ monolib_radiobox.o \ monolib_radiobut.o \ - monolib_renderer.o \ monolib_scrarrow.o \ monolib_scrolbar.o \ monolib_scrthumb.o \ @@ -2326,7 +2428,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_ctrlcmn.o \ monolib_ctrlsub.o \ monolib_datacmn.o \ - monolib_dbgrid.o \ monolib_dcbase.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ @@ -2385,36 +2486,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_wincmn.o \ monolib_xpmdecod.o \ monolib_busyinfo.o \ - monolib_calctrl.o \ monolib_choicdgg.o \ - monolib_dcbuffer.o \ monolib_dcpsg.o \ monolib_dirctrlg.o \ monolib_dragimgg.o \ - monolib_grid.o \ - monolib_gridctrl.o \ - monolib_gridsel.o \ - monolib_helpext.o \ - monolib_laywin.o \ monolib_logg.o \ monolib_numdlgg.o \ monolib_panelg.o \ monolib_progdlgg.o \ monolib_renderg.o \ - monolib_sashwin.o \ monolib_scrlwing.o \ monolib_selstore.o \ monolib_spinctlg.o \ - monolib_splash.o \ monolib_splitter.o \ monolib_tbarsmpl.o \ monolib_textdlgg.o \ - monolib_tipdlg.o \ monolib_tipwin.o \ monolib_treectlg.o \ monolib_vlbox.o \ - monolib_vscroll.o \ - monolib_wizard.o + monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_0) \ @@ -2433,7 +2523,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_ctrlcmn.o \ coredll_ctrlsub.o \ coredll_datacmn.o \ - coredll_dbgrid.o \ coredll_dcbase.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ @@ -2492,36 +2581,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_wincmn.o \ coredll_xpmdecod.o \ coredll_busyinfo.o \ - coredll_calctrl.o \ coredll_choicdgg.o \ - coredll_dcbuffer.o \ coredll_dcpsg.o \ coredll_dirctrlg.o \ coredll_dragimgg.o \ - coredll_grid.o \ - coredll_gridctrl.o \ - coredll_gridsel.o \ - coredll_helpext.o \ - coredll_laywin.o \ coredll_logg.o \ coredll_numdlgg.o \ coredll_panelg.o \ coredll_progdlgg.o \ coredll_renderg.o \ - coredll_sashwin.o \ coredll_scrlwing.o \ coredll_selstore.o \ coredll_spinctlg.o \ - coredll_splash.o \ coredll_splitter.o \ coredll_tbarsmpl.o \ coredll_textdlgg.o \ - coredll_tipdlg.o \ coredll_tipwin.o \ coredll_treectlg.o \ coredll_vlbox.o \ - coredll_vscroll.o \ - coredll_wizard.o + coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_0) \ @@ -2546,6 +2624,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_colschem.o \ coredll_combobox.o \ coredll_control.o \ + coredll_ctrlrend.o \ coredll_dialog.o \ coredll_framuniv.o \ coredll_gauge.o \ @@ -2556,7 +2635,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_notebook.o \ coredll_radiobox.o \ coredll_radiobut.o \ - coredll_renderer.o \ coredll_scrarrow.o \ coredll_scrolbar.o \ coredll_scrthumb.o \ @@ -2588,7 +2666,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_ctrlcmn.o \ coredll_ctrlsub.o \ coredll_datacmn.o \ - coredll_dbgrid.o \ coredll_dcbase.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ @@ -2647,36 +2724,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_wincmn.o \ coredll_xpmdecod.o \ coredll_busyinfo.o \ - coredll_calctrl.o \ coredll_choicdgg.o \ - coredll_dcbuffer.o \ coredll_dcpsg.o \ coredll_dirctrlg.o \ coredll_dragimgg.o \ - coredll_grid.o \ - coredll_gridctrl.o \ - coredll_gridsel.o \ - coredll_helpext.o \ - coredll_laywin.o \ coredll_logg.o \ coredll_numdlgg.o \ coredll_panelg.o \ coredll_progdlgg.o \ coredll_renderg.o \ - coredll_sashwin.o \ coredll_scrlwing.o \ coredll_selstore.o \ coredll_spinctlg.o \ - coredll_splash.o \ coredll_splitter.o \ coredll_tbarsmpl.o \ coredll_textdlgg.o \ - coredll_tipdlg.o \ coredll_tipwin.o \ coredll_treectlg.o \ coredll_vlbox.o \ - coredll_vscroll.o \ - coredll_wizard.o + coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_8) \ @@ -2695,7 +2761,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_ctrlcmn.o \ corelib_ctrlsub.o \ corelib_datacmn.o \ - corelib_dbgrid.o \ corelib_dcbase.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ @@ -2754,36 +2819,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_wincmn.o \ corelib_xpmdecod.o \ corelib_busyinfo.o \ - corelib_calctrl.o \ corelib_choicdgg.o \ - corelib_dcbuffer.o \ corelib_dcpsg.o \ corelib_dirctrlg.o \ corelib_dragimgg.o \ - corelib_grid.o \ - corelib_gridctrl.o \ - corelib_gridsel.o \ - corelib_helpext.o \ - corelib_laywin.o \ corelib_logg.o \ corelib_numdlgg.o \ corelib_panelg.o \ corelib_progdlgg.o \ corelib_renderg.o \ - corelib_sashwin.o \ corelib_scrlwing.o \ corelib_selstore.o \ corelib_spinctlg.o \ - corelib_splash.o \ corelib_splitter.o \ corelib_tbarsmpl.o \ corelib_textdlgg.o \ - corelib_tipdlg.o \ corelib_tipwin.o \ corelib_treectlg.o \ corelib_vlbox.o \ - corelib_vscroll.o \ - corelib_wizard.o + corelib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_8) \ @@ -2808,6 +2862,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_colschem.o \ corelib_combobox.o \ corelib_control.o \ + corelib_ctrlrend.o \ corelib_dialog.o \ corelib_framuniv.o \ corelib_gauge.o \ @@ -2818,7 +2873,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_notebook.o \ corelib_radiobox.o \ corelib_radiobut.o \ - corelib_renderer.o \ corelib_scrarrow.o \ corelib_scrolbar.o \ corelib_scrthumb.o \ @@ -2850,7 +2904,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_ctrlcmn.o \ corelib_ctrlsub.o \ corelib_datacmn.o \ - corelib_dbgrid.o \ corelib_dcbase.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ @@ -2909,36 +2962,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_wincmn.o \ corelib_xpmdecod.o \ corelib_busyinfo.o \ - corelib_calctrl.o \ corelib_choicdgg.o \ - corelib_dcbuffer.o \ corelib_dcpsg.o \ corelib_dirctrlg.o \ corelib_dragimgg.o \ - corelib_grid.o \ - corelib_gridctrl.o \ - corelib_gridsel.o \ - corelib_helpext.o \ - corelib_laywin.o \ corelib_logg.o \ corelib_numdlgg.o \ corelib_panelg.o \ corelib_progdlgg.o \ corelib_renderg.o \ - corelib_sashwin.o \ corelib_scrlwing.o \ corelib_selstore.o \ corelib_spinctlg.o \ - corelib_splash.o \ corelib_splitter.o \ corelib_tbarsmpl.o \ corelib_textdlgg.o \ - corelib_tipdlg.o \ corelib_tipwin.o \ corelib_treectlg.o \ corelib_vlbox.o \ - corelib_vscroll.o \ - corelib_wizard.o + corelib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_NSBox.o \ @@ -3045,7 +3087,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ monodll_notebook.o \ monodll_radiobox.o \ monodll_radiobut.o \ - monodll_renderer.o \ monodll_scrolbar.o \ monodll_scrolwin.o \ monodll_slider.o \ @@ -3173,7 +3214,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_frame.o \ monodll_gauge.o \ monodll_gdiobj.o \ - monodll_gsockmot.o \ monodll_icon.o \ monodll_listbox.o \ monodll_main.o \ @@ -3246,7 +3286,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_printwin.o \ monodll_radiobox.o \ monodll_radiobut.o \ - monodll_renderer.o \ monodll_scrolbar.o \ monodll_slider95.o \ monodll_spinbutt.o \ @@ -3260,8 +3299,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_tbar95.o \ monodll_textctrl.o \ monodll_tglbtn.o \ - monodll_treectrl.o \ - monodll_uxtheme.o + monodll_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_caret.o \ @@ -3298,7 +3336,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_gdiimage.o \ monodll_gdiobj.o \ monodll_gsocket.o \ - monodll_gsockpm.o \ monodll_helpwin.o \ monodll_icon.o \ monodll_iniconf.o \ @@ -3443,7 +3480,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ monolib_notebook.o \ monolib_radiobox.o \ monolib_radiobut.o \ - monolib_renderer.o \ monolib_scrolbar.o \ monolib_scrolwin.o \ monolib_slider.o \ @@ -3571,7 +3607,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_frame.o \ monolib_gauge.o \ monolib_gdiobj.o \ - monolib_gsockmot.o \ monolib_icon.o \ monolib_listbox.o \ monolib_main.o \ @@ -3644,7 +3679,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_printwin.o \ monolib_radiobox.o \ monolib_radiobut.o \ - monolib_renderer.o \ monolib_scrolbar.o \ monolib_slider95.o \ monolib_spinbutt.o \ @@ -3658,8 +3692,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_tbar95.o \ monolib_textctrl.o \ monolib_tglbtn.o \ - monolib_treectrl.o \ - monolib_uxtheme.o + monolib_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_caret.o \ @@ -3696,7 +3729,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_gdiimage.o \ monolib_gdiobj.o \ monolib_gsocket.o \ - monolib_gsockpm.o \ monolib_helpwin.o \ monolib_icon.o \ monolib_iniconf.o \ @@ -3841,7 +3873,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ coredll_notebook.o \ coredll_radiobox.o \ coredll_radiobut.o \ - coredll_renderer.o \ coredll_scrolbar.o \ coredll_scrolwin.o \ coredll_slider.o \ @@ -3969,7 +4000,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_frame.o \ coredll_gauge.o \ coredll_gdiobj.o \ - coredll_gsockmot.o \ coredll_icon.o \ coredll_listbox.o \ coredll_main.o \ @@ -4042,7 +4072,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_printwin.o \ coredll_radiobox.o \ coredll_radiobut.o \ - coredll_renderer.o \ coredll_scrolbar.o \ coredll_slider95.o \ coredll_spinbutt.o \ @@ -4056,8 +4085,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_tbar95.o \ coredll_textctrl.o \ coredll_tglbtn.o \ - coredll_treectrl.o \ - coredll_uxtheme.o + coredll_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_caret.o \ @@ -4094,7 +4122,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_gdiimage.o \ coredll_gdiobj.o \ coredll_gsocket.o \ - coredll_gsockpm.o \ coredll_helpwin.o \ coredll_icon.o \ coredll_iniconf.o \ @@ -4239,7 +4266,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ corelib_notebook.o \ corelib_radiobox.o \ corelib_radiobut.o \ - corelib_renderer.o \ corelib_scrolbar.o \ corelib_scrolwin.o \ corelib_slider.o \ @@ -4367,7 +4393,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_frame.o \ corelib_gauge.o \ corelib_gdiobj.o \ - corelib_gsockmot.o \ corelib_icon.o \ corelib_listbox.o \ corelib_main.o \ @@ -4440,7 +4465,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_printwin.o \ corelib_radiobox.o \ corelib_radiobut.o \ - corelib_renderer.o \ corelib_scrolbar.o \ corelib_slider95.o \ corelib_spinbutt.o \ @@ -4454,8 +4478,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_tbar95.o \ corelib_textctrl.o \ corelib_tglbtn.o \ - corelib_treectrl.o \ - corelib_uxtheme.o + corelib_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_caret.o \ @@ -4492,7 +4515,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_gdiimage.o \ corelib_gdiobj.o \ corelib_gsocket.o \ - corelib_gsockpm.o \ corelib_helpwin.o \ corelib_icon.o \ corelib_iniconf.o \ @@ -4587,12 +4609,12 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS = \ monodll_evtloop.o \ monodll_font.o \ monodll_gdiobj.o \ - monodll_gsockgtk.o \ monodll_icon.o \ monodll_main.o \ monodll_pen.o \ monodll_popupwin.o \ monodll_region.o \ + monodll_renderer.o \ monodll_settings.o \ monodll_timer.o \ monodll_tooltip.o \ @@ -4687,12 +4709,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_pen.o \ monodll_popupwin.o \ monodll_region.o \ + monodll_renderer.o \ monodll_settings.o \ monodll_taskbar.o \ monodll_timer.o \ monodll_tooltip.o \ monodll_toplevel.o \ monodll_utilsgui.o \ + monodll_uxtheme.o \ monodll_wave.o \ monodll_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) @@ -4722,7 +4746,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_evtloop.o \ monodll_font.o \ monodll_gdiobj.o \ - monodll_gsockx11.o \ monodll_icon.o \ monodll_joystick.o \ monodll_main.o \ @@ -4766,12 +4789,12 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_evtloop.o \ coredll_font.o \ coredll_gdiobj.o \ - coredll_gsockgtk.o \ coredll_icon.o \ coredll_main.o \ coredll_pen.o \ coredll_popupwin.o \ coredll_region.o \ + coredll_renderer.o \ coredll_settings.o \ coredll_timer.o \ coredll_tooltip.o \ @@ -4866,12 +4889,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_pen.o \ coredll_popupwin.o \ coredll_region.o \ + coredll_renderer.o \ coredll_settings.o \ coredll_taskbar.o \ coredll_timer.o \ coredll_tooltip.o \ coredll_toplevel.o \ coredll_utilsgui.o \ + coredll_uxtheme.o \ coredll_wave.o \ coredll_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0) @@ -4901,7 +4926,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_evtloop.o \ coredll_font.o \ coredll_gdiobj.o \ - coredll_gsockx11.o \ coredll_icon.o \ coredll_joystick.o \ coredll_main.o \ @@ -4945,12 +4969,12 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_evtloop.o \ corelib_font.o \ corelib_gdiobj.o \ - corelib_gsockgtk.o \ corelib_icon.o \ corelib_main.o \ corelib_pen.o \ corelib_popupwin.o \ corelib_region.o \ + corelib_renderer.o \ corelib_settings.o \ corelib_timer.o \ corelib_tooltip.o \ @@ -5045,12 +5069,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_pen.o \ corelib_popupwin.o \ corelib_region.o \ + corelib_renderer.o \ corelib_settings.o \ corelib_taskbar.o \ corelib_timer.o \ corelib_tooltip.o \ corelib_toplevel.o \ corelib_utilsgui.o \ + corelib_uxtheme.o \ corelib_wave.o \ corelib_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8) @@ -5080,7 +5106,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_evtloop.o \ corelib_font.o \ corelib_gdiobj.o \ - corelib_gsockx11.o \ corelib_icon.o \ corelib_joystick.o \ corelib_main.o \ @@ -5124,12 +5149,12 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_evtloop.o \ monolib_font.o \ monolib_gdiobj.o \ - monolib_gsockgtk.o \ monolib_icon.o \ monolib_main.o \ monolib_pen.o \ monolib_popupwin.o \ monolib_region.o \ + monolib_renderer.o \ monolib_settings.o \ monolib_timer.o \ monolib_tooltip.o \ @@ -5224,12 +5249,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_pen.o \ monolib_popupwin.o \ monolib_region.o \ + monolib_renderer.o \ monolib_settings.o \ monolib_taskbar.o \ monolib_timer.o \ monolib_tooltip.o \ monolib_toplevel.o \ monolib_utilsgui.o \ + monolib_uxtheme.o \ monolib_wave.o \ monolib_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9) @@ -5259,7 +5286,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_evtloop.o \ monolib_font.o \ monolib_gdiobj.o \ - monolib_gsockx11.o \ monolib_icon.o \ monolib_joystick.o \ monolib_main.o \ @@ -5278,6 +5304,18 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9) COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ $(__CORE_SRC_OBJECTS) \ + monodll_dbgrid.o \ + monodll_calctrl.o \ + monodll_dcbuffer.o \ + monodll_grid.o \ + monodll_gridctrl.o \ + monodll_gridsel.o \ + monodll_helpext.o \ + monodll_laywin.o \ + monodll_sashwin.o \ + monodll_splash.o \ + monodll_tipdlg.o \ + monodll_wizard.o \ $(__HTML_SRC_PLATFORM_OBJECTS) \ monodll_helpctrl.o \ monodll_helpdata.o \ @@ -5303,6 +5341,18 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS) COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ $(__CORE_SRC_OBJECTS_1) \ + monolib_dbgrid.o \ + monolib_calctrl.o \ + monolib_dcbuffer.o \ + monolib_grid.o \ + monolib_gridctrl.o \ + monolib_gridsel.o \ + monolib_helpext.o \ + monolib_laywin.o \ + monolib_sashwin.o \ + monolib_splash.o \ + monolib_tipdlg.o \ + monolib_wizard.o \ $(__HTML_SRC_PLATFORM_OBJECTS_1) \ monolib_helpctrl.o \ monolib_helpdata.o \ @@ -5396,6 +5446,44 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname) +COND_PLATFORM_WIN32_1___advdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib) +COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd) +COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___advdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags) +COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags) +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname) COND_MONOLITHIC_0_SHARED_1___basedll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname) @@ -5548,6 +5636,10 @@ COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_advlib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib @COND_USE_GUI_1@__install_afm___depname = install-afm @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll @COND_MONOLITHIC_0_SHARED_0@__install_baselib___depname = install_baselib @@ -5726,7 +5818,88 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) + +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd) + +advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(ADVLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(ADVLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ + +advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) @@ -6315,6 +6488,10 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -6525,9 +6702,6 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6753,6 +6927,9 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@coredll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6828,9 +7005,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@coredll_dc.o: $(srcdir)/src/x11/dc.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6858,9 +7032,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7311,30 +7482,9 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1@coredll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1@coredll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - -coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - -coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7344,9 +7494,6 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7464,9 +7611,6 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_USE_GUI_1@coredll_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7887,14 +8031,11 @@ coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@coredll_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7905,9 +8046,6 @@ coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8028,9 +8166,6 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8283,9 +8418,6 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@coredll_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8406,8 +8538,8 @@ coredll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8475,9 +8607,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8678,9 +8807,6 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8906,6 +9032,9 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@corelib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8981,9 +9110,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@corelib_dc.o: $(srcdir)/src/x11/dc.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9011,9 +9137,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9464,30 +9587,9 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@corelib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_USE_GUI_1@corelib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_USE_GUI_1@corelib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - -corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - -corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9497,9 +9599,6 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9617,9 +9716,6 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_USE_GUI_1@corelib_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10040,14 +10136,11 @@ corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@corelib_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10058,9 +10151,6 @@ corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_USE_GUI_1@corelib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10181,9 +10271,6 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10436,9 +10523,6 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@corelib_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10559,8 +10643,8 @@ corelib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10628,9 +10712,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10818,13 +10899,13 @@ htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< -install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) +install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) $(INSTALL_DIR) $(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(datadir)/aclocal) $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx) $(INSTALL_DIR) $(includedir) - for f in wx/app.h wx/apptrait.h wx/arrimpl.cpp wx/arrstr.h wx/beforestd.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/containr.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_mem.h wx/fs_zip.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/init.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/listimpl.cpp wx/log.h wx/longlong.h wx/math.h wx/memconf.h wx/memory.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/types.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/fs_inet.h wx/gsocket.h wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h wx/protocol/protocol.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/url.h $(NET_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/wxhtml.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \ + for f in $(ALL_HEADERS); do \ if test ! -d $(includedir)/`dirname $$f` ; then \ $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ fi; \ @@ -10844,6 +10925,7 @@ install-strip: install $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -10853,6 +10935,16 @@ install-wxconfig: $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(bindir) (cd $(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__advdll___so_symlinks_inst_cmd)) + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(libdir) + @COND_MONOLITHIC_0_SHARED_1@install_basedll: @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @@ -11173,8 +11265,8 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11413,6 +11505,9 @@ monodll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp @COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11497,8 +11592,8 @@ monodll_datstrm.o: $(srcdir)/src/common/datstrm.cpp monodll_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11530,8 +11625,8 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12049,14 +12144,14 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_gsocket.o: $(srcdir)/src/mac/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -12076,21 +12171,9 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< - -monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< - monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< - monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12115,8 +12198,8 @@ monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12271,8 +12354,8 @@ monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp @COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12778,14 +12861,11 @@ monodll_registry.o: $(srcdir)/src/msw/registry.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monodll_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12796,8 +12876,8 @@ monodll_registry.o: $(srcdir)/src/msw/registry.cpp @COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12946,8 +13026,8 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13234,8 +13314,8 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@monodll_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13381,8 +13461,8 @@ monodll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13459,8 +13539,8 @@ monodll_winpars.o: $(srcdir)/src/html/winpars.cpp monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13692,8 +13772,8 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13932,6 +14012,9 @@ monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp @COND_USE_GUI_1@monolib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14016,8 +14099,8 @@ monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp monolib_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14049,8 +14132,8 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14568,14 +14651,14 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monolib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_gsocket.o: $(srcdir)/src/mac/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -14595,21 +14678,9 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< - -monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< - monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< - monolib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14634,8 +14705,8 @@ monolib_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp monolib_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14790,8 +14861,8 @@ monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp @COND_USE_GUI_1@monolib_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15297,14 +15368,11 @@ monolib_registry.o: $(srcdir)/src/msw/registry.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monolib_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15315,8 +15383,8 @@ monolib_registry.o: $(srcdir)/src/msw/registry.cpp @COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15465,8 +15533,8 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15753,8 +15821,8 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15900,8 +15968,8 @@ monolib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15978,8 +16046,8 @@ monolib_winpars.o: $(srcdir)/src/html/winpars.cpp monolib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16559,4 +16627,4 @@ xmllib_xml.o: $(srcdir)/src/xml/xml.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall +.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall diff --git a/build/makefile.bcc b/build/makefile.bcc index 2ba3439071..0b566248c1 100644 --- a/build/makefile.bcc +++ b/build/makefile.bcc @@ -20,6 +20,44 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advdll.csm +ADVDLL_OBJECTS = \ + $(OBJS)\advdll_dummy.obj \ + $(OBJS)\advdll_dbgrid.obj \ + $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_dcbuffer.obj \ + $(OBJS)\advdll_grid.obj \ + $(OBJS)\advdll_gridctrl.obj \ + $(OBJS)\advdll_gridsel.obj \ + $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_sashwin.obj \ + $(OBJS)\advdll_splash.obj \ + $(OBJS)\advdll_tipdlg.obj \ + $(OBJS)\advdll_wizard.obj +ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advlib.csm +ADVLIB_OBJECTS = \ + $(OBJS)\advlib_dummy.obj \ + $(OBJS)\advlib_dbgrid.obj \ + $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_dcbuffer.obj \ + $(OBJS)\advlib_grid.obj \ + $(OBJS)\advlib_gridctrl.obj \ + $(OBJS)\advlib_gridsel.obj \ + $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_sashwin.obj \ + $(OBJS)\advlib_splash.obj \ + $(OBJS)\advlib_tipdlg.obj \ + $(OBJS)\advlib_wizard.obj BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ @@ -893,7 +931,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_ctrlsub.obj \ $(OBJS)\monolib_datacmn.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ @@ -952,36 +989,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_splitter.obj \ $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_wizard.obj + $(OBJS)\monolib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -1096,7 +1122,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_ctrlsub.obj \ $(OBJS)\monolib_datacmn.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ @@ -1155,36 +1180,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_splitter.obj \ $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_wizard.obj + $(OBJS)\monolib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1301,7 +1315,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_ctrlsub.obj \ $(OBJS)\coredll_datacmn.obj \ - $(OBJS)\coredll_dbgrid.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ @@ -1360,36 +1373,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_calctrl.obj \ $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_dcbuffer.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_grid.obj \ - $(OBJS)\coredll_gridctrl.obj \ - $(OBJS)\coredll_gridsel.obj \ - $(OBJS)\coredll_helpext.obj \ - $(OBJS)\coredll_laywin.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_sashwin.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splash.obj \ $(OBJS)\coredll_splitter.obj \ $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipdlg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_wizard.obj + $(OBJS)\coredll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1504,7 +1506,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_ctrlsub.obj \ $(OBJS)\coredll_datacmn.obj \ - $(OBJS)\coredll_dbgrid.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ @@ -1563,36 +1564,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_calctrl.obj \ $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_dcbuffer.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_grid.obj \ - $(OBJS)\coredll_gridctrl.obj \ - $(OBJS)\coredll_gridsel.obj \ - $(OBJS)\coredll_helpext.obj \ - $(OBJS)\coredll_laywin.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_sashwin.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splash.obj \ $(OBJS)\coredll_splitter.obj \ $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipdlg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_wizard.obj + $(OBJS)\coredll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -1709,7 +1699,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_ctrlsub.obj \ $(OBJS)\corelib_datacmn.obj \ - $(OBJS)\corelib_dbgrid.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ @@ -1768,36 +1757,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_calctrl.obj \ $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_dcbuffer.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_grid.obj \ - $(OBJS)\corelib_gridctrl.obj \ - $(OBJS)\corelib_gridsel.obj \ - $(OBJS)\corelib_helpext.obj \ - $(OBJS)\corelib_laywin.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_sashwin.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splash.obj \ $(OBJS)\corelib_splitter.obj \ $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipdlg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_wizard.obj + $(OBJS)\corelib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -1912,7 +1890,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_ctrlsub.obj \ $(OBJS)\corelib_datacmn.obj \ - $(OBJS)\corelib_dbgrid.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ @@ -1971,36 +1948,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_calctrl.obj \ $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_dcbuffer.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_grid.obj \ - $(OBJS)\corelib_gridctrl.obj \ - $(OBJS)\corelib_gridsel.obj \ - $(OBJS)\corelib_helpext.obj \ - $(OBJS)\corelib_laywin.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_sashwin.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splash.obj \ $(OBJS)\corelib_splitter.obj \ $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipdlg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_wizard.obj + $(OBJS)\corelib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2117,7 +2083,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_ctrlsub.obj \ $(OBJS)\monodll_datacmn.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ @@ -2176,36 +2141,25 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_splitter.obj \ $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_wizard.obj + $(OBJS)\monodll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2320,7 +2274,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_ctrlsub.obj \ $(OBJS)\monodll_datacmn.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ @@ -2379,40 +2332,41 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_splitter.obj \ $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_wizard.obj + $(OBJS)\monodll_vscroll.obj !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ + $(OBJS)\monolib_dbgrid.obj \ + $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_dcbuffer.obj \ + $(OBJS)\monolib_grid.obj \ + $(OBJS)\monolib_gridctrl.obj \ + $(OBJS)\monolib_gridsel.obj \ + $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_sashwin.obj \ + $(OBJS)\monolib_splash.obj \ + $(OBJS)\monolib_tipdlg.obj \ + $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -2439,6 +2393,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ + $(OBJS)\monodll_dbgrid.obj \ + $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_dcbuffer.obj \ + $(OBJS)\monodll_grid.obj \ + $(OBJS)\monodll_gridctrl.obj \ + $(OBJS)\monodll_gridsel.obj \ + $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_sashwin.obj \ + $(OBJS)\monodll_splash.obj \ + $(OBJS)\monodll_tipdlg.obj \ + $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -2462,6 +2428,14 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +__advdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +__advlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll @@ -2535,7 +2509,85 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) + +$(OBJS)\advdll_calctrl.obj: ..\src\generic\calctrl.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $** + +$(OBJS)\advdll_grid.obj: ..\src\generic\grid.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_gridctrl.obj: ..\src\generic\gridctrl.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_helpext.obj: ..\src\generic\helpext.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_laywin.obj: ..\src\generic\laywin.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_splash.obj: ..\src\generic\splash.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_tipdlg.obj: ..\src\generic\tipdlg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_wizard.obj: ..\src\generic\wizard.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advlib_calctrl.obj: ..\src\generic\calctrl.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H $** + +$(OBJS)\advlib_grid.obj: ..\src\generic\grid.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_gridctrl.obj: ..\src\generic\gridctrl.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_helpext.obj: ..\src\generic\helpext.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_laywin.obj: ..\src\generic\laywin.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_splash.obj: ..\src\generic\splash.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_tipdlg.obj: ..\src\generic\tipdlg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_wizard.obj: ..\src\generic\wizard.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\basedll_appbase.obj: ..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -3046,11 +3098,6 @@ $(OBJS)\coredll_button.obj: ..\src\msw\button.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_calctrl.obj: ..\src\generic\calctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_caret.obj: ..\src\msw\caret.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3190,11 +3237,6 @@ $(OBJS)\coredll_dataobj.obj: ..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dc.obj: ..\src\msw\dc.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3205,11 +3247,6 @@ $(OBJS)\coredll_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dcclient.obj: ..\src\msw\dcclient.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3454,21 +3491,6 @@ $(OBJS)\coredll_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_grid.obj: ..\src\generic\grid.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridctrl.obj: ..\src\generic\gridctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridsel.obj: ..\src\generic\gridsel.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_gtk.obj: ..\src\univ\themes\gtk.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3482,11 +3504,6 @@ $(OBJS)\coredll_helpchm.obj: ..\src\msw\helpchm.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpext.obj: ..\src\generic\helpext.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_helpwin.obj: ..\src\msw\helpwin.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3591,11 +3608,6 @@ $(OBJS)\coredll_layout.obj: ..\src\common\layout.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_laywin.obj: ..\src\generic\laywin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_lboxcmn.obj: ..\src\common\lboxcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3824,11 +3836,6 @@ $(OBJS)\coredll_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_sashwin.obj: ..\src\generic\sashwin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_scrarrow.obj: ..\src\univ\scrarrow.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3894,11 +3901,6 @@ $(OBJS)\coredll_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\coredll_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_splash.obj: ..\src\generic\splash.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_splitter.obj: ..\src\generic\splitter.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4027,11 +4029,6 @@ $(OBJS)\coredll_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tipdlg.obj: ..\src\generic\tipdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_tipwin.obj: ..\src\generic\tipwin.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4136,11 +4133,6 @@ $(OBJS)\coredll_window.obj: ..\src\msw\window.cpp $(OBJS)\coredll_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wizard.obj: ..\src\generic\wizard.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4229,11 +4221,6 @@ $(OBJS)\corelib_button.obj: ..\src\msw\button.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_calctrl.obj: ..\src\generic\calctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_caret.obj: ..\src\msw\caret.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4373,11 +4360,6 @@ $(OBJS)\corelib_dataobj.obj: ..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dc.obj: ..\src\msw\dc.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4388,11 +4370,6 @@ $(OBJS)\corelib_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dcclient.obj: ..\src\msw\dcclient.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4637,21 +4614,6 @@ $(OBJS)\corelib_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_grid.obj: ..\src\generic\grid.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridctrl.obj: ..\src\generic\gridctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridsel.obj: ..\src\generic\gridsel.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_gtk.obj: ..\src\univ\themes\gtk.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4665,11 +4627,6 @@ $(OBJS)\corelib_helpchm.obj: ..\src\msw\helpchm.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpext.obj: ..\src\generic\helpext.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_helpwin.obj: ..\src\msw\helpwin.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4774,11 +4731,6 @@ $(OBJS)\corelib_layout.obj: ..\src\common\layout.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_laywin.obj: ..\src\generic\laywin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_lboxcmn.obj: ..\src\common\lboxcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5007,11 +4959,6 @@ $(OBJS)\corelib_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_sashwin.obj: ..\src\generic\sashwin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_scrarrow.obj: ..\src\univ\scrarrow.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5077,11 +5024,6 @@ $(OBJS)\corelib_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\corelib_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_splash.obj: ..\src\generic\splash.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_splitter.obj: ..\src\generic\splitter.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5210,11 +5152,6 @@ $(OBJS)\corelib_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tipdlg.obj: ..\src\generic\tipdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_tipwin.obj: ..\src\generic\tipwin.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5319,11 +5256,6 @@ $(OBJS)\corelib_window.obj: ..\src\msw\window.cpp $(OBJS)\corelib_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wizard.obj: ..\src\generic\wizard.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5568,10 +5500,8 @@ $(OBJS)\monodll_button.obj: ..\src\msw\button.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_calctrl.obj: ..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_caret.obj: ..\src\msw\caret.cpp @@ -5733,10 +5663,8 @@ $(OBJS)\monodll_datstrm.obj: ..\src\common\datstrm.cpp $(OBJS)\monodll_db.obj: ..\src\common\db.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_dbgrid.obj: ..\src\common\dbgrid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5751,10 +5679,8 @@ $(OBJS)\monodll_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcclient.obj: ..\src\msw\dcclient.cpp @@ -6054,20 +5980,14 @@ $(OBJS)\monodll_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_gridctrl.obj: ..\src\generic\gridctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_gridsel.obj: ..\src\generic\gridsel.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_gsocket.obj: ..\src\msw\gsocket.c $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** @@ -6103,10 +6023,8 @@ $(OBJS)\monodll_helpctrl.obj: ..\src\html\helpctrl.cpp $(OBJS)\monodll_helpdata.obj: ..\src\html\helpdata.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_helpext.obj: ..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_helpfrm.obj: ..\src\html\helpfrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6248,10 +6166,8 @@ $(OBJS)\monodll_layout.obj: ..\src\common\layout.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_laywin.obj: ..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_lboxcmn.obj: ..\src\common\lboxcmn.cpp @@ -6553,10 +6469,8 @@ $(OBJS)\monodll_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_sashwin.obj: ..\src\generic\sashwin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_sckaddr.obj: ..\src\common\sckaddr.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6641,10 +6555,8 @@ $(OBJS)\monodll_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\monodll_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_splash.obj: ..\src\generic\splash.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_splitter.obj: ..\src\generic\splitter.cpp @@ -6798,10 +6710,8 @@ $(OBJS)\monodll_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipwin.obj: ..\src\generic\tipwin.cpp @@ -6934,10 +6844,8 @@ $(OBJS)\monodll_winpars.obj: ..\src\html\winpars.cpp $(OBJS)\monodll_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wizard.obj: ..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_wxchar.obj: ..\src\common\wxchar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7045,10 +6953,8 @@ $(OBJS)\monolib_button.obj: ..\src\msw\button.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_calctrl.obj: ..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_caret.obj: ..\src\msw\caret.cpp @@ -7210,10 +7116,8 @@ $(OBJS)\monolib_datstrm.obj: ..\src\common\datstrm.cpp $(OBJS)\monolib_db.obj: ..\src\common\db.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_dbgrid.obj: ..\src\common\dbgrid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7228,10 +7132,8 @@ $(OBJS)\monolib_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcclient.obj: ..\src\msw\dcclient.cpp @@ -7531,20 +7433,14 @@ $(OBJS)\monolib_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_gridctrl.obj: ..\src\generic\gridctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_gridsel.obj: ..\src\generic\gridsel.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_gsocket.obj: ..\src\msw\gsocket.c $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** @@ -7580,10 +7476,8 @@ $(OBJS)\monolib_helpctrl.obj: ..\src\html\helpctrl.cpp $(OBJS)\monolib_helpdata.obj: ..\src\html\helpdata.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_helpext.obj: ..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_helpfrm.obj: ..\src\html\helpfrm.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7725,10 +7619,8 @@ $(OBJS)\monolib_layout.obj: ..\src\common\layout.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_laywin.obj: ..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_lboxcmn.obj: ..\src\common\lboxcmn.cpp @@ -8030,10 +7922,8 @@ $(OBJS)\monolib_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_sashwin.obj: ..\src\generic\sashwin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_sckaddr.obj: ..\src\common\sckaddr.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8118,10 +8008,8 @@ $(OBJS)\monolib_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\monolib_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_splash.obj: ..\src\generic\splash.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_splitter.obj: ..\src\generic\splitter.cpp @@ -8275,10 +8163,8 @@ $(OBJS)\monolib_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipwin.obj: ..\src\generic\tipwin.cpp @@ -8411,10 +8297,8 @@ $(OBJS)\monolib_winpars.obj: ..\src\html\winpars.cpp $(OBJS)\monolib_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wizard.obj: ..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_wxchar.obj: ..\src\common\wxchar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8874,6 +8758,22 @@ $(OBJS)\xmllib_dummy.obj: ..\src\msw\dummy.cpp $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $** +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(ADVLIB_OBJECTS) +| +!endif + !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| @@ -8911,6 +8811,9 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib diff --git a/build/makefile.gcc b/build/makefile.gcc index 5067c768af..6fc15cb1aa 100644 --- a/build/makefile.gcc +++ b/build/makefile.gcc @@ -12,6 +12,44 @@ include config.gcc ### Variables: ### +ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) +ADVDLL_OBJECTS = \ + $(OBJS)\advdll_dummy.o \ + $(OBJS)\advdll_dbgrid.o \ + $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_dcbuffer.o \ + $(OBJS)\advdll_grid.o \ + $(OBJS)\advdll_gridctrl.o \ + $(OBJS)\advdll_gridsel.o \ + $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_laywin.o \ + $(OBJS)\advdll_sashwin.o \ + $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_wizard.o +ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + $(CXXFLAGS) +ADVLIB_OBJECTS = \ + $(OBJS)\advlib_dummy.o \ + $(OBJS)\advlib_dbgrid.o \ + $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_dcbuffer.o \ + $(OBJS)\advlib_grid.o \ + $(OBJS)\advlib_gridctrl.o \ + $(OBJS)\advlib_gridsel.o \ + $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_laywin.o \ + $(OBJS)\advlib_sashwin.o \ + $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_wizard.o BASEDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ @@ -809,12 +847,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ $(OBJS)\monolib_region.o \ + $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ $(OBJS)\monolib_taskbar.o \ $(OBJS)\monolib_timer.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_utilsgui.o \ + $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_wave.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_statusbr.o \ @@ -852,7 +892,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_printwin.o \ $(OBJS)\monolib_radiobox.o \ $(OBJS)\monolib_radiobut.o \ - $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_scrolbar.o \ $(OBJS)\monolib_slider95.o \ $(OBJS)\monolib_spinbutt.o \ @@ -867,7 +906,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.o \ $(OBJS)\monolib_tglbtn.o \ $(OBJS)\monolib_treectrl.o \ - $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_accesscmn.o \ $(OBJS)\monolib_appcmn.o \ $(OBJS)\monolib_artprov.o \ @@ -882,7 +920,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.o \ $(OBJS)\monolib_ctrlsub.o \ $(OBJS)\monolib_datacmn.o \ - $(OBJS)\monolib_dbgrid.o \ $(OBJS)\monolib_dcbase.o \ $(OBJS)\monolib_dlgcmn.o \ $(OBJS)\monolib_dndcmn.o \ @@ -941,36 +978,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.o \ $(OBJS)\monolib_xpmdecod.o \ $(OBJS)\monolib_busyinfo.o \ - $(OBJS)\monolib_calctrl.o \ $(OBJS)\monolib_choicdgg.o \ - $(OBJS)\monolib_dcbuffer.o \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ - $(OBJS)\monolib_grid.o \ - $(OBJS)\monolib_gridctrl.o \ - $(OBJS)\monolib_gridsel.o \ - $(OBJS)\monolib_helpext.o \ - $(OBJS)\monolib_laywin.o \ $(OBJS)\monolib_logg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ $(OBJS)\monolib_renderg.o \ - $(OBJS)\monolib_sashwin.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ $(OBJS)\monolib_spinctlg.o \ - $(OBJS)\monolib_splash.o \ $(OBJS)\monolib_splitter.o \ $(OBJS)\monolib_tbarsmpl.o \ $(OBJS)\monolib_textdlgg.o \ - $(OBJS)\monolib_tipdlg.o \ $(OBJS)\monolib_tipwin.o \ $(OBJS)\monolib_treectlg.o \ $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o \ - $(OBJS)\monolib_wizard.o + $(OBJS)\monolib_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -1016,12 +1042,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ $(OBJS)\monolib_region.o \ + $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ $(OBJS)\monolib_taskbar.o \ $(OBJS)\monolib_timer.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_utilsgui.o \ + $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_wave.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_textctrl.o \ @@ -1045,6 +1073,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_colschem.o \ $(OBJS)\monolib_combobox.o \ $(OBJS)\monolib_control.o \ + $(OBJS)\monolib_ctrlrend.o \ $(OBJS)\monolib_dialog.o \ $(OBJS)\monolib_framuniv.o \ $(OBJS)\monolib_gauge.o \ @@ -1055,7 +1084,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notebook.o \ $(OBJS)\monolib_radiobox.o \ $(OBJS)\monolib_radiobut.o \ - $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_scrarrow.o \ $(OBJS)\monolib_scrolbar.o \ $(OBJS)\monolib_scrthumb.o \ @@ -1087,7 +1115,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.o \ $(OBJS)\monolib_ctrlsub.o \ $(OBJS)\monolib_datacmn.o \ - $(OBJS)\monolib_dbgrid.o \ $(OBJS)\monolib_dcbase.o \ $(OBJS)\monolib_dlgcmn.o \ $(OBJS)\monolib_dndcmn.o \ @@ -1146,36 +1173,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.o \ $(OBJS)\monolib_xpmdecod.o \ $(OBJS)\monolib_busyinfo.o \ - $(OBJS)\monolib_calctrl.o \ $(OBJS)\monolib_choicdgg.o \ - $(OBJS)\monolib_dcbuffer.o \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ - $(OBJS)\monolib_grid.o \ - $(OBJS)\monolib_gridctrl.o \ - $(OBJS)\monolib_gridsel.o \ - $(OBJS)\monolib_helpext.o \ - $(OBJS)\monolib_laywin.o \ $(OBJS)\monolib_logg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ $(OBJS)\monolib_renderg.o \ - $(OBJS)\monolib_sashwin.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ $(OBJS)\monolib_spinctlg.o \ - $(OBJS)\monolib_splash.o \ $(OBJS)\monolib_splitter.o \ $(OBJS)\monolib_tbarsmpl.o \ $(OBJS)\monolib_textdlgg.o \ - $(OBJS)\monolib_tipdlg.o \ $(OBJS)\monolib_tipwin.o \ $(OBJS)\monolib_treectlg.o \ $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o \ - $(OBJS)\monolib_wizard.o + $(OBJS)\monolib_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -1221,12 +1237,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ $(OBJS)\coredll_region.o \ + $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ $(OBJS)\coredll_taskbar.o \ $(OBJS)\coredll_timer.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_utilsgui.o \ + $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_wave.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_statusbr.o \ @@ -1264,7 +1282,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_printwin.o \ $(OBJS)\coredll_radiobox.o \ $(OBJS)\coredll_radiobut.o \ - $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_scrolbar.o \ $(OBJS)\coredll_slider95.o \ $(OBJS)\coredll_spinbutt.o \ @@ -1279,7 +1296,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.o \ $(OBJS)\coredll_tglbtn.o \ $(OBJS)\coredll_treectrl.o \ - $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_accesscmn.o \ $(OBJS)\coredll_appcmn.o \ $(OBJS)\coredll_artprov.o \ @@ -1294,7 +1310,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.o \ $(OBJS)\coredll_ctrlsub.o \ $(OBJS)\coredll_datacmn.o \ - $(OBJS)\coredll_dbgrid.o \ $(OBJS)\coredll_dcbase.o \ $(OBJS)\coredll_dlgcmn.o \ $(OBJS)\coredll_dndcmn.o \ @@ -1353,36 +1368,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.o \ $(OBJS)\coredll_xpmdecod.o \ $(OBJS)\coredll_busyinfo.o \ - $(OBJS)\coredll_calctrl.o \ $(OBJS)\coredll_choicdgg.o \ - $(OBJS)\coredll_dcbuffer.o \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ - $(OBJS)\coredll_grid.o \ - $(OBJS)\coredll_gridctrl.o \ - $(OBJS)\coredll_gridsel.o \ - $(OBJS)\coredll_helpext.o \ - $(OBJS)\coredll_laywin.o \ $(OBJS)\coredll_logg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ $(OBJS)\coredll_renderg.o \ - $(OBJS)\coredll_sashwin.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ $(OBJS)\coredll_spinctlg.o \ - $(OBJS)\coredll_splash.o \ $(OBJS)\coredll_splitter.o \ $(OBJS)\coredll_tbarsmpl.o \ $(OBJS)\coredll_textdlgg.o \ - $(OBJS)\coredll_tipdlg.o \ $(OBJS)\coredll_tipwin.o \ $(OBJS)\coredll_treectlg.o \ $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o \ - $(OBJS)\coredll_wizard.o + $(OBJS)\coredll_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -1428,12 +1432,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ $(OBJS)\coredll_region.o \ + $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ $(OBJS)\coredll_taskbar.o \ $(OBJS)\coredll_timer.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_utilsgui.o \ + $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_wave.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_textctrl.o \ @@ -1457,6 +1463,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_colschem.o \ $(OBJS)\coredll_combobox.o \ $(OBJS)\coredll_control.o \ + $(OBJS)\coredll_ctrlrend.o \ $(OBJS)\coredll_dialog.o \ $(OBJS)\coredll_framuniv.o \ $(OBJS)\coredll_gauge.o \ @@ -1467,7 +1474,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_notebook.o \ $(OBJS)\coredll_radiobox.o \ $(OBJS)\coredll_radiobut.o \ - $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_scrarrow.o \ $(OBJS)\coredll_scrolbar.o \ $(OBJS)\coredll_scrthumb.o \ @@ -1499,7 +1505,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.o \ $(OBJS)\coredll_ctrlsub.o \ $(OBJS)\coredll_datacmn.o \ - $(OBJS)\coredll_dbgrid.o \ $(OBJS)\coredll_dcbase.o \ $(OBJS)\coredll_dlgcmn.o \ $(OBJS)\coredll_dndcmn.o \ @@ -1558,36 +1563,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.o \ $(OBJS)\coredll_xpmdecod.o \ $(OBJS)\coredll_busyinfo.o \ - $(OBJS)\coredll_calctrl.o \ $(OBJS)\coredll_choicdgg.o \ - $(OBJS)\coredll_dcbuffer.o \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ - $(OBJS)\coredll_grid.o \ - $(OBJS)\coredll_gridctrl.o \ - $(OBJS)\coredll_gridsel.o \ - $(OBJS)\coredll_helpext.o \ - $(OBJS)\coredll_laywin.o \ $(OBJS)\coredll_logg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ $(OBJS)\coredll_renderg.o \ - $(OBJS)\coredll_sashwin.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ $(OBJS)\coredll_spinctlg.o \ - $(OBJS)\coredll_splash.o \ $(OBJS)\coredll_splitter.o \ $(OBJS)\coredll_tbarsmpl.o \ $(OBJS)\coredll_textdlgg.o \ - $(OBJS)\coredll_tipdlg.o \ $(OBJS)\coredll_tipwin.o \ $(OBJS)\coredll_treectlg.o \ $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o \ - $(OBJS)\coredll_wizard.o + $(OBJS)\coredll_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -1633,12 +1627,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ $(OBJS)\corelib_region.o \ + $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ $(OBJS)\corelib_taskbar.o \ $(OBJS)\corelib_timer.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_utilsgui.o \ + $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_wave.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_statusbr.o \ @@ -1676,7 +1672,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_printwin.o \ $(OBJS)\corelib_radiobox.o \ $(OBJS)\corelib_radiobut.o \ - $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_scrolbar.o \ $(OBJS)\corelib_slider95.o \ $(OBJS)\corelib_spinbutt.o \ @@ -1691,7 +1686,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.o \ $(OBJS)\corelib_tglbtn.o \ $(OBJS)\corelib_treectrl.o \ - $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_accesscmn.o \ $(OBJS)\corelib_appcmn.o \ $(OBJS)\corelib_artprov.o \ @@ -1706,7 +1700,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.o \ $(OBJS)\corelib_ctrlsub.o \ $(OBJS)\corelib_datacmn.o \ - $(OBJS)\corelib_dbgrid.o \ $(OBJS)\corelib_dcbase.o \ $(OBJS)\corelib_dlgcmn.o \ $(OBJS)\corelib_dndcmn.o \ @@ -1765,36 +1758,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.o \ $(OBJS)\corelib_xpmdecod.o \ $(OBJS)\corelib_busyinfo.o \ - $(OBJS)\corelib_calctrl.o \ $(OBJS)\corelib_choicdgg.o \ - $(OBJS)\corelib_dcbuffer.o \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ - $(OBJS)\corelib_grid.o \ - $(OBJS)\corelib_gridctrl.o \ - $(OBJS)\corelib_gridsel.o \ - $(OBJS)\corelib_helpext.o \ - $(OBJS)\corelib_laywin.o \ $(OBJS)\corelib_logg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ $(OBJS)\corelib_renderg.o \ - $(OBJS)\corelib_sashwin.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ $(OBJS)\corelib_spinctlg.o \ - $(OBJS)\corelib_splash.o \ $(OBJS)\corelib_splitter.o \ $(OBJS)\corelib_tbarsmpl.o \ $(OBJS)\corelib_textdlgg.o \ - $(OBJS)\corelib_tipdlg.o \ $(OBJS)\corelib_tipwin.o \ $(OBJS)\corelib_treectlg.o \ $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o \ - $(OBJS)\corelib_wizard.o + $(OBJS)\corelib_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -1840,12 +1822,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ $(OBJS)\corelib_region.o \ + $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ $(OBJS)\corelib_taskbar.o \ $(OBJS)\corelib_timer.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_utilsgui.o \ + $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_wave.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_textctrl.o \ @@ -1869,6 +1853,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_colschem.o \ $(OBJS)\corelib_combobox.o \ $(OBJS)\corelib_control.o \ + $(OBJS)\corelib_ctrlrend.o \ $(OBJS)\corelib_dialog.o \ $(OBJS)\corelib_framuniv.o \ $(OBJS)\corelib_gauge.o \ @@ -1879,7 +1864,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_notebook.o \ $(OBJS)\corelib_radiobox.o \ $(OBJS)\corelib_radiobut.o \ - $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_scrarrow.o \ $(OBJS)\corelib_scrolbar.o \ $(OBJS)\corelib_scrthumb.o \ @@ -1911,7 +1895,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.o \ $(OBJS)\corelib_ctrlsub.o \ $(OBJS)\corelib_datacmn.o \ - $(OBJS)\corelib_dbgrid.o \ $(OBJS)\corelib_dcbase.o \ $(OBJS)\corelib_dlgcmn.o \ $(OBJS)\corelib_dndcmn.o \ @@ -1970,36 +1953,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.o \ $(OBJS)\corelib_xpmdecod.o \ $(OBJS)\corelib_busyinfo.o \ - $(OBJS)\corelib_calctrl.o \ $(OBJS)\corelib_choicdgg.o \ - $(OBJS)\corelib_dcbuffer.o \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ - $(OBJS)\corelib_grid.o \ - $(OBJS)\corelib_gridctrl.o \ - $(OBJS)\corelib_gridsel.o \ - $(OBJS)\corelib_helpext.o \ - $(OBJS)\corelib_laywin.o \ $(OBJS)\corelib_logg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ $(OBJS)\corelib_renderg.o \ - $(OBJS)\corelib_sashwin.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ $(OBJS)\corelib_spinctlg.o \ - $(OBJS)\corelib_splash.o \ $(OBJS)\corelib_splitter.o \ $(OBJS)\corelib_tbarsmpl.o \ $(OBJS)\corelib_textdlgg.o \ - $(OBJS)\corelib_tipdlg.o \ $(OBJS)\corelib_tipwin.o \ $(OBJS)\corelib_treectlg.o \ $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o \ - $(OBJS)\corelib_wizard.o + $(OBJS)\corelib_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -2045,12 +2017,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ $(OBJS)\monodll_region.o \ + $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ $(OBJS)\monodll_taskbar.o \ $(OBJS)\monodll_timer.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_utilsgui.o \ + $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_wave.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_statusbr.o \ @@ -2088,7 +2062,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_printwin.o \ $(OBJS)\monodll_radiobox.o \ $(OBJS)\monodll_radiobut.o \ - $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_scrolbar.o \ $(OBJS)\monodll_slider95.o \ $(OBJS)\monodll_spinbutt.o \ @@ -2103,7 +2076,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.o \ $(OBJS)\monodll_tglbtn.o \ $(OBJS)\monodll_treectrl.o \ - $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_accesscmn.o \ $(OBJS)\monodll_appcmn.o \ $(OBJS)\monodll_artprov.o \ @@ -2118,7 +2090,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.o \ $(OBJS)\monodll_ctrlsub.o \ $(OBJS)\monodll_datacmn.o \ - $(OBJS)\monodll_dbgrid.o \ $(OBJS)\monodll_dcbase.o \ $(OBJS)\monodll_dlgcmn.o \ $(OBJS)\monodll_dndcmn.o \ @@ -2177,36 +2148,25 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.o \ $(OBJS)\monodll_xpmdecod.o \ $(OBJS)\monodll_busyinfo.o \ - $(OBJS)\monodll_calctrl.o \ $(OBJS)\monodll_choicdgg.o \ - $(OBJS)\monodll_dcbuffer.o \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ - $(OBJS)\monodll_grid.o \ - $(OBJS)\monodll_gridctrl.o \ - $(OBJS)\monodll_gridsel.o \ - $(OBJS)\monodll_helpext.o \ - $(OBJS)\monodll_laywin.o \ $(OBJS)\monodll_logg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ $(OBJS)\monodll_renderg.o \ - $(OBJS)\monodll_sashwin.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ $(OBJS)\monodll_spinctlg.o \ - $(OBJS)\monodll_splash.o \ $(OBJS)\monodll_splitter.o \ $(OBJS)\monodll_tbarsmpl.o \ $(OBJS)\monodll_textdlgg.o \ - $(OBJS)\monodll_tipdlg.o \ $(OBJS)\monodll_tipwin.o \ $(OBJS)\monodll_treectlg.o \ $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o \ - $(OBJS)\monodll_wizard.o + $(OBJS)\monodll_vscroll.o endif endif ifeq ($(USE_GUI),1) @@ -2252,12 +2212,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ $(OBJS)\monodll_region.o \ + $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ $(OBJS)\monodll_taskbar.o \ $(OBJS)\monodll_timer.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_utilsgui.o \ + $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_wave.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_textctrl.o \ @@ -2281,6 +2243,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_colschem.o \ $(OBJS)\monodll_combobox.o \ $(OBJS)\monodll_control.o \ + $(OBJS)\monodll_ctrlrend.o \ $(OBJS)\monodll_dialog.o \ $(OBJS)\monodll_framuniv.o \ $(OBJS)\monodll_gauge.o \ @@ -2291,7 +2254,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notebook.o \ $(OBJS)\monodll_radiobox.o \ $(OBJS)\monodll_radiobut.o \ - $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_scrarrow.o \ $(OBJS)\monodll_scrolbar.o \ $(OBJS)\monodll_scrthumb.o \ @@ -2323,7 +2285,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.o \ $(OBJS)\monodll_ctrlsub.o \ $(OBJS)\monodll_datacmn.o \ - $(OBJS)\monodll_dbgrid.o \ $(OBJS)\monodll_dcbase.o \ $(OBJS)\monodll_dlgcmn.o \ $(OBJS)\monodll_dndcmn.o \ @@ -2382,41 +2343,42 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.o \ $(OBJS)\monodll_xpmdecod.o \ $(OBJS)\monodll_busyinfo.o \ - $(OBJS)\monodll_calctrl.o \ $(OBJS)\monodll_choicdgg.o \ - $(OBJS)\monodll_dcbuffer.o \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ - $(OBJS)\monodll_grid.o \ - $(OBJS)\monodll_gridctrl.o \ - $(OBJS)\monodll_gridsel.o \ - $(OBJS)\monodll_helpext.o \ - $(OBJS)\monodll_laywin.o \ $(OBJS)\monodll_logg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ $(OBJS)\monodll_renderg.o \ - $(OBJS)\monodll_sashwin.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ $(OBJS)\monodll_spinctlg.o \ - $(OBJS)\monodll_splash.o \ $(OBJS)\monodll_splitter.o \ $(OBJS)\monodll_tbarsmpl.o \ $(OBJS)\monodll_textdlgg.o \ - $(OBJS)\monodll_tipdlg.o \ $(OBJS)\monodll_tipwin.o \ $(OBJS)\monodll_treectlg.o \ $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o \ - $(OBJS)\monodll_wizard.o + $(OBJS)\monodll_vscroll.o endif endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ + $(OBJS)\monolib_dbgrid.o \ + $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_dcbuffer.o \ + $(OBJS)\monolib_grid.o \ + $(OBJS)\monolib_gridctrl.o \ + $(OBJS)\monolib_gridsel.o \ + $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_laywin.o \ + $(OBJS)\monolib_sashwin.o \ + $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_helpbest.o \ $(OBJS)\monolib_helpctrl.o \ $(OBJS)\monolib_helpdata.o \ @@ -2443,6 +2405,18 @@ endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ + $(OBJS)\monodll_dbgrid.o \ + $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_dcbuffer.o \ + $(OBJS)\monodll_grid.o \ + $(OBJS)\monodll_gridctrl.o \ + $(OBJS)\monodll_gridsel.o \ + $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_laywin.o \ + $(OBJS)\monodll_sashwin.o \ + $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_helpbest.o \ $(OBJS)\monodll_helpctrl.o \ $(OBJS)\monodll_helpdata.o \ @@ -2468,6 +2442,22 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +__advdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +__advlib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) __basedll___depname = \ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll endif @@ -2579,7 +2569,85 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all: setup_h $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) + +$(OBJS)\advdll_calctrl.o: ..\src\generic\calctrl.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_dbgrid.o: ..\src\common\dbgrid.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_dcbuffer.o: ..\src\generic\dcbuffer.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_dummy.o: ..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_grid.o: ..\src\generic\grid.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_gridctrl.o: ..\src\generic\gridctrl.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_gridsel.o: ..\src\generic\gridsel.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_helpext.o: ..\src\generic\helpext.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_laywin.o: ..\src\generic\laywin.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_sashwin.o: ..\src\generic\sashwin.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_splash.o: ..\src\generic\splash.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_tipdlg.o: ..\src\generic\tipdlg.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_wizard.o: ..\src\generic\wizard.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advlib_calctrl.o: ..\src\generic\calctrl.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_dbgrid.o: ..\src\common\dbgrid.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_dcbuffer.o: ..\src\generic\dcbuffer.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_dummy.o: ..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_grid.o: ..\src\generic\grid.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_gridctrl.o: ..\src\generic\gridctrl.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_gridsel.o: ..\src\generic\gridsel.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_helpext.o: ..\src\generic\helpext.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_laywin.o: ..\src\generic\laywin.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_sashwin.o: ..\src\generic\sashwin.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_splash.o: ..\src\generic\splash.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_tipdlg.o: ..\src\generic\tipdlg.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_wizard.o: ..\src\generic\wizard.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\basedll_appbase.o: ..\src\common\appbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -3102,11 +3170,6 @@ $(OBJS)\coredll_button.o: ..\src\msw\button.cpp endif endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_calctrl.o: ..\src\generic\calctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_caret.o: ..\src\msw\caret.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3241,6 +3304,9 @@ $(OBJS)\coredll_ctrlcmn.o: ..\src\common\ctrlcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +$(OBJS)\coredll_ctrlrend.o: ..\src\univ\ctrlrend.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< + ifeq ($(USE_GUI),1) $(OBJS)\coredll_ctrlsub.o: ..\src\common\ctrlsub.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3266,11 +3332,6 @@ $(OBJS)\coredll_dataobj.o: ..\src\msw\ole\dataobj.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dbgrid.o: ..\src\common\dbgrid.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_dc.o: ..\src\msw\dc.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3281,11 +3342,6 @@ $(OBJS)\coredll_dcbase.o: ..\src\common\dcbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcbuffer.o: ..\src\generic\dcbuffer.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_dcclient.o: ..\src\msw\dcclient.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3538,21 +3594,6 @@ $(OBJS)\coredll_gifdecod.o: ..\src\common\gifdecod.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_grid.o: ..\src\generic\grid.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gridctrl.o: ..\src\generic\gridctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gridsel.o: ..\src\generic\gridsel.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - $(OBJS)\coredll_gtk.o: ..\src\univ\themes\gtk.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3566,11 +3607,6 @@ $(OBJS)\coredll_helpchm.o: ..\src\msw\helpchm.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_helpext.o: ..\src\generic\helpext.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_helpwin.o: ..\src\msw\helpwin.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3679,11 +3715,6 @@ $(OBJS)\coredll_layout.o: ..\src\common\layout.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_laywin.o: ..\src\generic\laywin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_lboxcmn.o: ..\src\common\lboxcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3917,18 +3948,9 @@ $(OBJS)\coredll_rendcmn.o: ..\src\common\rendcmn.cpp endif ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\coredll_renderer.o: ..\src\univ\renderer.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) $(OBJS)\coredll_renderer.o: ..\src\msw\renderer.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -endif ifeq ($(USE_GUI),1) $(OBJS)\coredll_renderg.o: ..\src\generic\renderg.cpp @@ -3940,11 +3962,6 @@ $(OBJS)\coredll_rgncmn.o: ..\src\common\rgncmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_sashwin.o: ..\src\generic\sashwin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - $(OBJS)\coredll_scrarrow.o: ..\src\univ\scrarrow.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4018,11 +4035,6 @@ endif $(OBJS)\coredll_spinctrl.o: ..\src\msw\spinctrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_splash.o: ..\src\generic\splash.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_splitter.o: ..\src\generic\splitter.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4175,11 +4187,6 @@ $(OBJS)\coredll_timercmn.o: ..\src\common\timercmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_tipdlg.o: ..\src\generic\tipdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_tipwin.o: ..\src\generic\tipwin.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4232,8 +4239,10 @@ $(OBJS)\coredll_uuid.o: ..\src\msw\ole\uuid.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\coredll_uxtheme.o: ..\src\msw\uxtheme.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\coredll_valgen.o: ..\src\common\valgen.cpp @@ -4284,11 +4293,6 @@ endif $(OBJS)\coredll_winuniv.o: ..\src\univ\winuniv.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_wizard.o: ..\src\generic\wizard.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_xpmdecod.o: ..\src\common\xpmdecod.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4389,11 +4393,6 @@ $(OBJS)\corelib_button.o: ..\src\msw\button.cpp endif endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_calctrl.o: ..\src\generic\calctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_caret.o: ..\src\msw\caret.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -4528,6 +4527,9 @@ $(OBJS)\corelib_ctrlcmn.o: ..\src\common\ctrlcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +$(OBJS)\corelib_ctrlrend.o: ..\src\univ\ctrlrend.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< + ifeq ($(USE_GUI),1) $(OBJS)\corelib_ctrlsub.o: ..\src\common\ctrlsub.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -4553,11 +4555,6 @@ $(OBJS)\corelib_dataobj.o: ..\src\msw\ole\dataobj.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dbgrid.o: ..\src\common\dbgrid.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_dc.o: ..\src\msw\dc.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -4568,11 +4565,6 @@ $(OBJS)\corelib_dcbase.o: ..\src\common\dcbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcbuffer.o: ..\src\generic\dcbuffer.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_dcclient.o: ..\src\msw\dcclient.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -4825,21 +4817,6 @@ $(OBJS)\corelib_gifdecod.o: ..\src\common\gifdecod.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_grid.o: ..\src\generic\grid.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gridctrl.o: ..\src\generic\gridctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gridsel.o: ..\src\generic\gridsel.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - $(OBJS)\corelib_gtk.o: ..\src\univ\themes\gtk.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -4853,11 +4830,6 @@ $(OBJS)\corelib_helpchm.o: ..\src\msw\helpchm.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_helpext.o: ..\src\generic\helpext.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_helpwin.o: ..\src\msw\helpwin.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -4966,11 +4938,6 @@ $(OBJS)\corelib_layout.o: ..\src\common\layout.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_laywin.o: ..\src\generic\laywin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_lboxcmn.o: ..\src\common\lboxcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5204,18 +5171,9 @@ $(OBJS)\corelib_rendcmn.o: ..\src\common\rendcmn.cpp endif ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\corelib_renderer.o: ..\src\univ\renderer.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) $(OBJS)\corelib_renderer.o: ..\src\msw\renderer.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -endif ifeq ($(USE_GUI),1) $(OBJS)\corelib_renderg.o: ..\src\generic\renderg.cpp @@ -5227,11 +5185,6 @@ $(OBJS)\corelib_rgncmn.o: ..\src\common\rgncmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_sashwin.o: ..\src\generic\sashwin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - $(OBJS)\corelib_scrarrow.o: ..\src\univ\scrarrow.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5305,11 +5258,6 @@ endif $(OBJS)\corelib_spinctrl.o: ..\src\msw\spinctrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_splash.o: ..\src\generic\splash.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_splitter.o: ..\src\generic\splitter.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5462,11 +5410,6 @@ $(OBJS)\corelib_timercmn.o: ..\src\common\timercmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_tipdlg.o: ..\src\generic\tipdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_tipwin.o: ..\src\generic\tipwin.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5519,8 +5462,10 @@ $(OBJS)\corelib_uuid.o: ..\src\msw\ole\uuid.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\corelib_uxtheme.o: ..\src\msw\uxtheme.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\corelib_valgen.o: ..\src\common\valgen.cpp @@ -5571,11 +5516,6 @@ endif $(OBJS)\corelib_winuniv.o: ..\src\univ\winuniv.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_wizard.o: ..\src\generic\wizard.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_xpmdecod.o: ..\src\common\xpmdecod.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5832,10 +5772,8 @@ $(OBJS)\monodll_button.o: ..\src\msw\button.cpp endif endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_calctrl.o: ..\src\generic\calctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_caret.o: ..\src\msw\caret.cpp @@ -5983,6 +5921,9 @@ $(OBJS)\monodll_ctrlcmn.o: ..\src\common\ctrlcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +$(OBJS)\monodll_ctrlrend.o: ..\src\univ\ctrlrend.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + ifeq ($(USE_GUI),1) $(OBJS)\monodll_ctrlsub.o: ..\src\common\ctrlsub.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -6017,10 +5958,8 @@ $(OBJS)\monodll_datstrm.o: ..\src\common\datstrm.cpp $(OBJS)\monodll_db.o: ..\src\common\db.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monodll_dbgrid.o: ..\src\common\dbgrid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_dbtable.o: ..\src\common\dbtable.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -6035,10 +5974,8 @@ $(OBJS)\monodll_dcbase.o: ..\src\common\dcbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_dcbuffer.o: ..\src\generic\dcbuffer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_dcclient.o: ..\src\msw\dcclient.cpp @@ -6346,20 +6283,14 @@ $(OBJS)\monodll_gifdecod.o: ..\src\common\gifdecod.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_grid.o: ..\src\generic\grid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_gridctrl.o: ..\src\generic\gridctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_gridsel.o: ..\src\generic\gridsel.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_gsocket.o: ..\src\msw\gsocket.c $(CC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -6395,10 +6326,8 @@ $(OBJS)\monodll_helpctrl.o: ..\src\html\helpctrl.cpp $(OBJS)\monodll_helpdata.o: ..\src\html\helpdata.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monodll_helpext.o: ..\src\generic\helpext.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_helpfrm.o: ..\src\html\helpfrm.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -6544,10 +6473,8 @@ $(OBJS)\monodll_layout.o: ..\src\common\layout.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_laywin.o: ..\src\generic\laywin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_lboxcmn.o: ..\src\common\lboxcmn.cpp @@ -6854,18 +6781,9 @@ $(OBJS)\monodll_rendcmn.o: ..\src\common\rendcmn.cpp endif ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\monodll_renderer.o: ..\src\univ\renderer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) $(OBJS)\monodll_renderer.o: ..\src\msw\renderer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_renderg.o: ..\src\generic\renderg.cpp @@ -6877,10 +6795,8 @@ $(OBJS)\monodll_rgncmn.o: ..\src\common\rgncmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_sashwin.o: ..\src\generic\sashwin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_sckaddr.o: ..\src\common\sckaddr.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -6973,10 +6889,8 @@ endif $(OBJS)\monodll_spinctrl.o: ..\src\msw\spinctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monodll_splash.o: ..\src\generic\splash.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_splitter.o: ..\src\generic\splitter.cpp @@ -7154,10 +7068,8 @@ $(OBJS)\monodll_timercmn.o: ..\src\common\timercmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_tipdlg.o: ..\src\generic\tipdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_tipwin.o: ..\src\generic\tipwin.cpp @@ -7229,8 +7141,10 @@ $(OBJS)\monodll_uuid.o: ..\src\msw\ole\uuid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\monodll_uxtheme.o: ..\src\msw\uxtheme.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_valgen.o: ..\src\common\valgen.cpp @@ -7290,10 +7204,8 @@ $(OBJS)\monodll_winpars.o: ..\src\html\winpars.cpp $(OBJS)\monodll_winuniv.o: ..\src\univ\winuniv.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monodll_wizard.o: ..\src\generic\wizard.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_wxchar.o: ..\src\common\wxchar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -7413,10 +7325,8 @@ $(OBJS)\monolib_button.o: ..\src\msw\button.cpp endif endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_calctrl.o: ..\src\generic\calctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_caret.o: ..\src\msw\caret.cpp @@ -7564,6 +7474,9 @@ $(OBJS)\monolib_ctrlcmn.o: ..\src\common\ctrlcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +$(OBJS)\monolib_ctrlrend.o: ..\src\univ\ctrlrend.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + ifeq ($(USE_GUI),1) $(OBJS)\monolib_ctrlsub.o: ..\src\common\ctrlsub.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7598,10 +7511,8 @@ $(OBJS)\monolib_datstrm.o: ..\src\common\datstrm.cpp $(OBJS)\monolib_db.o: ..\src\common\db.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monolib_dbgrid.o: ..\src\common\dbgrid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_dbtable.o: ..\src\common\dbtable.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7616,10 +7527,8 @@ $(OBJS)\monolib_dcbase.o: ..\src\common\dcbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_dcbuffer.o: ..\src\generic\dcbuffer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_dcclient.o: ..\src\msw\dcclient.cpp @@ -7927,20 +7836,14 @@ $(OBJS)\monolib_gifdecod.o: ..\src\common\gifdecod.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_grid.o: ..\src\generic\grid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_gridctrl.o: ..\src\generic\gridctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_gridsel.o: ..\src\generic\gridsel.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_gsocket.o: ..\src\msw\gsocket.c $(CC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -7976,10 +7879,8 @@ $(OBJS)\monolib_helpctrl.o: ..\src\html\helpctrl.cpp $(OBJS)\monolib_helpdata.o: ..\src\html\helpdata.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monolib_helpext.o: ..\src\generic\helpext.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_helpfrm.o: ..\src\html\helpfrm.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -8125,10 +8026,8 @@ $(OBJS)\monolib_layout.o: ..\src\common\layout.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_laywin.o: ..\src\generic\laywin.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_lboxcmn.o: ..\src\common\lboxcmn.cpp @@ -8435,18 +8334,9 @@ $(OBJS)\monolib_rendcmn.o: ..\src\common\rendcmn.cpp endif ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\monolib_renderer.o: ..\src\univ\renderer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) $(OBJS)\monolib_renderer.o: ..\src\msw\renderer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_renderg.o: ..\src\generic\renderg.cpp @@ -8458,10 +8348,8 @@ $(OBJS)\monolib_rgncmn.o: ..\src\common\rgncmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_sashwin.o: ..\src\generic\sashwin.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_sckaddr.o: ..\src\common\sckaddr.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -8554,10 +8442,8 @@ endif $(OBJS)\monolib_spinctrl.o: ..\src\msw\spinctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monolib_splash.o: ..\src\generic\splash.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_splitter.o: ..\src\generic\splitter.cpp @@ -8735,10 +8621,8 @@ $(OBJS)\monolib_timercmn.o: ..\src\common\timercmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_tipdlg.o: ..\src\generic\tipdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_tipwin.o: ..\src\generic\tipwin.cpp @@ -8810,8 +8694,10 @@ $(OBJS)\monolib_uuid.o: ..\src\msw\ole\uuid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\monolib_uxtheme.o: ..\src\msw\uxtheme.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_valgen.o: ..\src\common\valgen.cpp @@ -8871,10 +8757,8 @@ $(OBJS)\monolib_winpars.o: ..\src\html\winpars.cpp $(OBJS)\monolib_winuniv.o: ..\src\univ\winuniv.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monolib_wizard.o: ..\src\generic\wizard.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_wxchar.o: ..\src\common\wxchar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -9334,6 +9218,26 @@ $(OBJS)\xmllib_dummy.o: ..\src\msw\dummy.cpp $(OBJS)\xmllib_xml.o: ..\src\xml\xml.cpp $(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $< +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +endif +endif +endif + +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(ADVLIB_OBJECTS) + ranlib $@ +endif +endif +endif + ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a @@ -9370,6 +9274,9 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a diff --git a/build/makefile.vc b/build/makefile.vc index ac0b9ea5e1..0aa9fa13cb 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -12,15 +12,59 @@ ### Variables: ### +ADVDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \ + $(__DEBUGINFO_30) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" +ADVDLL_OBJECTS = \ + $(OBJS)\advdll_dummy.obj \ + $(OBJS)\advdll_dbgrid.obj \ + $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_dcbuffer.obj \ + $(OBJS)\advdll_grid.obj \ + $(OBJS)\advdll_gridctrl.obj \ + $(OBJS)\advdll_gridsel.obj \ + $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_sashwin.obj \ + $(OBJS)\advdll_splash.obj \ + $(OBJS)\advdll_tipdlg.obj \ + $(OBJS)\advdll_wizard.obj +ADVLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) /DWIN32 \ + $(__DEBUGINFO_30) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \ + $(____DEBUGRUNTIME_131_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_advlib.pch" +ADVLIB_OBJECTS = \ + $(OBJS)\advlib_dummy.obj \ + $(OBJS)\advlib_dbgrid.obj \ + $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_dcbuffer.obj \ + $(OBJS)\advlib_grid.obj \ + $(OBJS)\advlib_gridctrl.obj \ + $(OBJS)\advlib_gridsel.obj \ + $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_sashwin.obj \ + $(OBJS)\advlib_splash.obj \ + $(OBJS)\advlib_tipdlg.obj \ + $(OBJS)\advlib_wizard.obj BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ /I..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ @@ -100,14 +144,14 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ /I..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ @@ -187,7 +231,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \ - /DWIN32 $(__DEBUGINFO_29) \ + /DWIN32 $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_104_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ @@ -205,7 +249,7 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \ - /DWIN32 $(__DEBUGINFO_29) \ + /DWIN32 $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ $(____DEBUGRUNTIME_113_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ @@ -222,10 +266,10 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) /DWIN32 \ - $(__DEBUGINFO_29) \ +GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) /DWIN32 \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_158_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_176_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) \ @@ -233,10 +277,10 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) /DWIN32 \ GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) /DWIN32 \ - $(__DEBUGINFO_29) \ +GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_186) /DWIN32 \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \ - $(____DEBUGRUNTIME_167_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_185_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ @@ -244,10 +288,10 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) /DWIN32 \ GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcanvas.obj -HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) \ - /DWIN32 $(__DEBUGINFO_29) \ +HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \ + /DWIN32 $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_140_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML \ @@ -276,10 +320,10 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_tables.obj \ $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) \ - /DWIN32 $(__DEBUGINFO_29) \ +HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) \ + /DWIN32 $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \ - $(____DEBUGRUNTIME_131_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_149_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ @@ -311,14 +355,14 @@ HTMLLIB_OBJECTS = \ LIBDIRNAME = \ ..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ /I..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS) MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ @@ -412,14 +456,14 @@ MONODLL_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ /I..\src\expat\lib /DwxUSE_BASE=1 $(CFLAGS) MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ @@ -513,14 +557,14 @@ MONOLIB_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS) NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ @@ -542,14 +586,14 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_gsocket.obj \ $(OBJS)\netdll_gsockmsw.obj NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS) NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \ - $(__DEBUGINFO_29) \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ @@ -573,7 +617,7 @@ NETLIB_OBJECTS = \ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 \ - $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_30) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_42_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) \ /DCOMPILED_FROM_DSP $(CFLAGS) WXEXPAT_OBJECTS = \ @@ -581,7 +625,7 @@ WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 \ - $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_30) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_26_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ @@ -631,7 +675,7 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_19) /DWIN32 \ - $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_30) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_18_p) $(__OPTIMIZEFLAG) /I..\src\zlib $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ @@ -652,7 +696,7 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_30) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ @@ -660,7 +704,7 @@ WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_35) /DWIN32 \ - $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_30) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_34_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ @@ -697,7 +741,7 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \ - $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_30) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ @@ -714,10 +758,10 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infcodes.obj \ $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj -XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) /DWIN32 \ - $(__DEBUGINFO_29) \ +XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) /DWIN32 \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_140_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_158_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) \ @@ -725,10 +769,10 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) /DWIN32 \ XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj -XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) /DWIN32 \ - $(__DEBUGINFO_29) \ +XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) /DWIN32 \ + $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \ - $(____DEBUGRUNTIME_149_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_167_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ @@ -791,16 +835,16 @@ __DEBUGINFO_28 = __DEBUGINFO_28 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_29 = /Zi +__DEBUGINFO_30 = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_29 = +__DEBUGINFO_30 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_29 = +__DEBUGINFO_30 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_29 = /Zi +__DEBUGINFO_30 = /Zi !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" __DEBUGRUNTIME_105 = @@ -884,6 +928,24 @@ __DEBUGRUNTIME_168 = d __DEBUGRUNTIME_168 = $(__DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_177 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_177 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_177 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_186 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_186 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_186 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" __DEBUGRUNTIME_19 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" @@ -1068,12 +1130,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_region.obj \ + $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ + $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_window.obj \ $(OBJS)\monolib_statusbr.obj \ @@ -1111,7 +1175,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_printwin.obj \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ - $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_scrolbar.obj \ $(OBJS)\monolib_slider95.obj \ $(OBJS)\monolib_spinbutt.obj \ @@ -1126,7 +1189,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ - $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_artprov.obj \ @@ -1141,7 +1203,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_ctrlsub.obj \ $(OBJS)\monolib_datacmn.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ @@ -1200,36 +1261,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_splitter.obj \ $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_wizard.obj + $(OBJS)\monolib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -1273,12 +1323,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_region.obj \ + $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ + $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_window.obj \ $(OBJS)\monolib_textctrl.obj \ @@ -1302,6 +1354,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_colschem.obj \ $(OBJS)\monolib_combobox.obj \ $(OBJS)\monolib_control.obj \ + $(OBJS)\monolib_ctrlrend.obj \ $(OBJS)\monolib_dialog.obj \ $(OBJS)\monolib_framuniv.obj \ $(OBJS)\monolib_gauge.obj \ @@ -1312,7 +1365,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notebook.obj \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ - $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_scrarrow.obj \ $(OBJS)\monolib_scrolbar.obj \ $(OBJS)\monolib_scrthumb.obj \ @@ -1344,7 +1396,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_ctrlsub.obj \ $(OBJS)\monolib_datacmn.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ @@ -1403,36 +1454,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_splitter.obj \ $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_wizard.obj + $(OBJS)\monolib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1476,12 +1516,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_region.obj \ + $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ + $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_wave.obj \ $(OBJS)\coredll_window.obj \ $(OBJS)\coredll_statusbr.obj \ @@ -1519,7 +1561,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_printwin.obj \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ - $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_scrolbar.obj \ $(OBJS)\coredll_slider95.obj \ $(OBJS)\coredll_spinbutt.obj \ @@ -1534,7 +1575,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ - $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_artprov.obj \ @@ -1549,7 +1589,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_ctrlsub.obj \ $(OBJS)\coredll_datacmn.obj \ - $(OBJS)\coredll_dbgrid.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ @@ -1608,36 +1647,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_calctrl.obj \ $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_dcbuffer.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_grid.obj \ - $(OBJS)\coredll_gridctrl.obj \ - $(OBJS)\coredll_gridsel.obj \ - $(OBJS)\coredll_helpext.obj \ - $(OBJS)\coredll_laywin.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_sashwin.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splash.obj \ $(OBJS)\coredll_splitter.obj \ $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipdlg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_wizard.obj + $(OBJS)\coredll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1681,12 +1709,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_region.obj \ + $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ + $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_wave.obj \ $(OBJS)\coredll_window.obj \ $(OBJS)\coredll_textctrl.obj \ @@ -1710,6 +1740,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_colschem.obj \ $(OBJS)\coredll_combobox.obj \ $(OBJS)\coredll_control.obj \ + $(OBJS)\coredll_ctrlrend.obj \ $(OBJS)\coredll_dialog.obj \ $(OBJS)\coredll_framuniv.obj \ $(OBJS)\coredll_gauge.obj \ @@ -1720,7 +1751,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_notebook.obj \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ - $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_scrarrow.obj \ $(OBJS)\coredll_scrolbar.obj \ $(OBJS)\coredll_scrthumb.obj \ @@ -1752,7 +1782,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_ctrlsub.obj \ $(OBJS)\coredll_datacmn.obj \ - $(OBJS)\coredll_dbgrid.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ @@ -1811,36 +1840,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_calctrl.obj \ $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_dcbuffer.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_grid.obj \ - $(OBJS)\coredll_gridctrl.obj \ - $(OBJS)\coredll_gridsel.obj \ - $(OBJS)\coredll_helpext.obj \ - $(OBJS)\coredll_laywin.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_sashwin.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splash.obj \ $(OBJS)\coredll_splitter.obj \ $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipdlg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_wizard.obj + $(OBJS)\coredll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -1884,12 +1902,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_region.obj \ + $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ + $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_wave.obj \ $(OBJS)\corelib_window.obj \ $(OBJS)\corelib_statusbr.obj \ @@ -1927,7 +1947,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_printwin.obj \ $(OBJS)\corelib_radiobox.obj \ $(OBJS)\corelib_radiobut.obj \ - $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_scrolbar.obj \ $(OBJS)\corelib_slider95.obj \ $(OBJS)\corelib_spinbutt.obj \ @@ -1942,7 +1961,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ - $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_artprov.obj \ @@ -1957,7 +1975,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_ctrlsub.obj \ $(OBJS)\corelib_datacmn.obj \ - $(OBJS)\corelib_dbgrid.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ @@ -2016,36 +2033,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_calctrl.obj \ $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_dcbuffer.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_grid.obj \ - $(OBJS)\corelib_gridctrl.obj \ - $(OBJS)\corelib_gridsel.obj \ - $(OBJS)\corelib_helpext.obj \ - $(OBJS)\corelib_laywin.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_sashwin.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splash.obj \ $(OBJS)\corelib_splitter.obj \ $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipdlg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_wizard.obj + $(OBJS)\corelib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -2089,12 +2095,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_region.obj \ + $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ + $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_wave.obj \ $(OBJS)\corelib_window.obj \ $(OBJS)\corelib_textctrl.obj \ @@ -2118,6 +2126,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_colschem.obj \ $(OBJS)\corelib_combobox.obj \ $(OBJS)\corelib_control.obj \ + $(OBJS)\corelib_ctrlrend.obj \ $(OBJS)\corelib_dialog.obj \ $(OBJS)\corelib_framuniv.obj \ $(OBJS)\corelib_gauge.obj \ @@ -2128,7 +2137,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_notebook.obj \ $(OBJS)\corelib_radiobox.obj \ $(OBJS)\corelib_radiobut.obj \ - $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_scrarrow.obj \ $(OBJS)\corelib_scrolbar.obj \ $(OBJS)\corelib_scrthumb.obj \ @@ -2160,7 +2168,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_ctrlsub.obj \ $(OBJS)\corelib_datacmn.obj \ - $(OBJS)\corelib_dbgrid.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ @@ -2219,36 +2226,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_calctrl.obj \ $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_dcbuffer.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_grid.obj \ - $(OBJS)\corelib_gridctrl.obj \ - $(OBJS)\corelib_gridsel.obj \ - $(OBJS)\corelib_helpext.obj \ - $(OBJS)\corelib_laywin.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_sashwin.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splash.obj \ $(OBJS)\corelib_splitter.obj \ $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipdlg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_wizard.obj + $(OBJS)\corelib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2292,12 +2288,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_region.obj \ + $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ + $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_window.obj \ $(OBJS)\monodll_statusbr.obj \ @@ -2335,7 +2333,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_printwin.obj \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ - $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_scrolbar.obj \ $(OBJS)\monodll_slider95.obj \ $(OBJS)\monodll_spinbutt.obj \ @@ -2350,7 +2347,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ - $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_artprov.obj \ @@ -2365,7 +2361,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_ctrlsub.obj \ $(OBJS)\monodll_datacmn.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ @@ -2424,36 +2419,25 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_splitter.obj \ $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_wizard.obj + $(OBJS)\monodll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2497,12 +2481,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_region.obj \ + $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ + $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_window.obj \ $(OBJS)\monodll_textctrl.obj \ @@ -2526,6 +2512,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_colschem.obj \ $(OBJS)\monodll_combobox.obj \ $(OBJS)\monodll_control.obj \ + $(OBJS)\monodll_ctrlrend.obj \ $(OBJS)\monodll_dialog.obj \ $(OBJS)\monodll_framuniv.obj \ $(OBJS)\monodll_gauge.obj \ @@ -2536,7 +2523,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notebook.obj \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ - $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_scrarrow.obj \ $(OBJS)\monodll_scrolbar.obj \ $(OBJS)\monodll_scrthumb.obj \ @@ -2568,7 +2554,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_ctrlsub.obj \ $(OBJS)\monodll_datacmn.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ @@ -2627,36 +2612,25 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_splitter.obj \ $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_wizard.obj + $(OBJS)\monodll_vscroll.obj !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" ____DEBUGINFO = /D_DEBUG @@ -2752,6 +2726,24 @@ ____DEBUGRUNTIME_167_p = /D_DEBUG ____DEBUGRUNTIME_167_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_176_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_176_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_176_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_185_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_185_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_185_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_18_p = /DNDEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" @@ -2853,6 +2845,18 @@ ____DEBUGRUNTIME_95_p = $(____DEBUGINFO) !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ + $(OBJS)\monolib_dbgrid.obj \ + $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_dcbuffer.obj \ + $(OBJS)\monolib_grid.obj \ + $(OBJS)\monolib_gridctrl.obj \ + $(OBJS)\monolib_gridsel.obj \ + $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_sashwin.obj \ + $(OBJS)\monolib_splash.obj \ + $(OBJS)\monolib_tipdlg.obj \ + $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -2879,6 +2883,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ + $(OBJS)\monodll_dbgrid.obj \ + $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_dcbuffer.obj \ + $(OBJS)\monodll_grid.obj \ + $(OBJS)\monodll_gridctrl.obj \ + $(OBJS)\monodll_gridsel.obj \ + $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_sashwin.obj \ + $(OBJS)\monodll_splash.obj \ + $(OBJS)\monodll_tipdlg.obj \ + $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -2902,6 +2918,14 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +__advdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +__advlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll @@ -2975,7 +2999,85 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) + +$(OBJS)\advdll_calctrl.obj: ..\src\generic\calctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\advdll_grid.obj: ..\src\generic\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_gridctrl.obj: ..\src\generic\gridctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_helpext.obj: ..\src\generic\helpext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_laywin.obj: ..\src\generic\laywin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_splash.obj: ..\src\generic\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_tipdlg.obj: ..\src\generic\tipdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_wizard.obj: ..\src\generic\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advlib_calctrl.obj: ..\src\generic\calctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\advlib_grid.obj: ..\src\generic\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_gridctrl.obj: ..\src\generic\gridctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_helpext.obj: ..\src\generic\helpext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_laywin.obj: ..\src\generic\laywin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_splash.obj: ..\src\generic\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_tipdlg.obj: ..\src\generic\tipdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_wizard.obj: ..\src\generic\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\basedll_appbase.obj: ..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -3486,11 +3588,6 @@ $(OBJS)\coredll_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_calctrl.obj: ..\src\generic\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_caret.obj: ..\src\msw\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3605,6 +3702,9 @@ $(OBJS)\coredll_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +$(OBJS)\coredll_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3630,11 +3730,6 @@ $(OBJS)\coredll_dataobj.obj: ..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dc.obj: ..\src\msw\dc.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3645,11 +3740,6 @@ $(OBJS)\coredll_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dcclient.obj: ..\src\msw\dcclient.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3894,21 +3984,6 @@ $(OBJS)\coredll_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_grid.obj: ..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridctrl.obj: ..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridsel.obj: ..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_gtk.obj: ..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3922,11 +3997,6 @@ $(OBJS)\coredll_helpchm.obj: ..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpext.obj: ..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_helpwin.obj: ..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4031,11 +4101,6 @@ $(OBJS)\coredll_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_laywin.obj: ..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_lboxcmn.obj: ..\src\common\lboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4244,12 +4309,7 @@ $(OBJS)\coredll_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_renderer.obj: ..\src\univ\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif @@ -4264,11 +4324,6 @@ $(OBJS)\coredll_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_sashwin.obj: ..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_scrarrow.obj: ..\src\univ\scrarrow.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4334,11 +4389,6 @@ $(OBJS)\coredll_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\coredll_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_splash.obj: ..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_splitter.obj: ..\src\generic\splitter.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4467,11 +4517,6 @@ $(OBJS)\coredll_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tipdlg.obj: ..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_tipwin.obj: ..\src\generic\tipwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4524,8 +4569,10 @@ $(OBJS)\coredll_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_valgen.obj: ..\src\common\valgen.cpp @@ -4576,11 +4623,6 @@ $(OBJS)\coredll_window.obj: ..\src\msw\window.cpp $(OBJS)\coredll_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wizard.obj: ..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4669,11 +4711,6 @@ $(OBJS)\corelib_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_calctrl.obj: ..\src\generic\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_caret.obj: ..\src\msw\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4788,6 +4825,9 @@ $(OBJS)\corelib_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +$(OBJS)\corelib_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4813,11 +4853,6 @@ $(OBJS)\corelib_dataobj.obj: ..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dc.obj: ..\src\msw\dc.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4828,11 +4863,6 @@ $(OBJS)\corelib_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dcclient.obj: ..\src\msw\dcclient.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5077,21 +5107,6 @@ $(OBJS)\corelib_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_grid.obj: ..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridctrl.obj: ..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridsel.obj: ..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_gtk.obj: ..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5105,11 +5120,6 @@ $(OBJS)\corelib_helpchm.obj: ..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpext.obj: ..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_helpwin.obj: ..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5214,11 +5224,6 @@ $(OBJS)\corelib_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_laywin.obj: ..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_lboxcmn.obj: ..\src\common\lboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5427,12 +5432,7 @@ $(OBJS)\corelib_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_renderer.obj: ..\src\univ\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif @@ -5447,11 +5447,6 @@ $(OBJS)\corelib_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_sashwin.obj: ..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_scrarrow.obj: ..\src\univ\scrarrow.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5517,11 +5512,6 @@ $(OBJS)\corelib_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\corelib_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_splash.obj: ..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_splitter.obj: ..\src\generic\splitter.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5650,11 +5640,6 @@ $(OBJS)\corelib_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tipdlg.obj: ..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_tipwin.obj: ..\src\generic\tipwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5707,8 +5692,10 @@ $(OBJS)\corelib_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_valgen.obj: ..\src\common\valgen.cpp @@ -5759,11 +5746,6 @@ $(OBJS)\corelib_window.obj: ..\src\msw\window.cpp $(OBJS)\corelib_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wizard.obj: ..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -6008,10 +5990,8 @@ $(OBJS)\monodll_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_calctrl.obj: ..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_caret.obj: ..\src\msw\caret.cpp @@ -6139,6 +6119,9 @@ $(OBJS)\monodll_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +$(OBJS)\monodll_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6173,10 +6156,8 @@ $(OBJS)\monodll_datstrm.obj: ..\src\common\datstrm.cpp $(OBJS)\monodll_db.obj: ..\src\common\db.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_dbgrid.obj: ..\src\common\dbgrid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6191,10 +6172,8 @@ $(OBJS)\monodll_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcclient.obj: ..\src\msw\dcclient.cpp @@ -6494,20 +6473,14 @@ $(OBJS)\monodll_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_gridctrl.obj: ..\src\generic\gridctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_gridsel.obj: ..\src\generic\gridsel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_gsocket.obj: ..\src\msw\gsocket.c $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $** @@ -6543,10 +6516,8 @@ $(OBJS)\monodll_helpctrl.obj: ..\src\html\helpctrl.cpp $(OBJS)\monodll_helpdata.obj: ..\src\html\helpdata.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_helpext.obj: ..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_helpfrm.obj: ..\src\html\helpfrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6688,10 +6659,8 @@ $(OBJS)\monodll_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_laywin.obj: ..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_lboxcmn.obj: ..\src\common\lboxcmn.cpp @@ -6973,12 +6942,7 @@ $(OBJS)\monodll_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_renderer.obj: ..\src\univ\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6993,10 +6957,8 @@ $(OBJS)\monodll_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_sashwin.obj: ..\src\generic\sashwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_sckaddr.obj: ..\src\common\sckaddr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7081,10 +7043,8 @@ $(OBJS)\monodll_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\monodll_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_splash.obj: ..\src\generic\splash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_splitter.obj: ..\src\generic\splitter.cpp @@ -7238,10 +7198,8 @@ $(OBJS)\monodll_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipwin.obj: ..\src\generic\tipwin.cpp @@ -7313,8 +7271,10 @@ $(OBJS)\monodll_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_valgen.obj: ..\src\common\valgen.cpp @@ -7374,10 +7334,8 @@ $(OBJS)\monodll_winpars.obj: ..\src\html\winpars.cpp $(OBJS)\monodll_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wizard.obj: ..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_wxchar.obj: ..\src\common\wxchar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7485,10 +7443,8 @@ $(OBJS)\monolib_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_calctrl.obj: ..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_caret.obj: ..\src\msw\caret.cpp @@ -7616,6 +7572,9 @@ $(OBJS)\monolib_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +$(OBJS)\monolib_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7650,10 +7609,8 @@ $(OBJS)\monolib_datstrm.obj: ..\src\common\datstrm.cpp $(OBJS)\monolib_db.obj: ..\src\common\db.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_dbgrid.obj: ..\src\common\dbgrid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7668,10 +7625,8 @@ $(OBJS)\monolib_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcclient.obj: ..\src\msw\dcclient.cpp @@ -7971,20 +7926,14 @@ $(OBJS)\monolib_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_gridctrl.obj: ..\src\generic\gridctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_gridsel.obj: ..\src\generic\gridsel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_gsocket.obj: ..\src\msw\gsocket.c $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $** @@ -8020,10 +7969,8 @@ $(OBJS)\monolib_helpctrl.obj: ..\src\html\helpctrl.cpp $(OBJS)\monolib_helpdata.obj: ..\src\html\helpdata.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_helpext.obj: ..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_helpfrm.obj: ..\src\html\helpfrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8165,10 +8112,8 @@ $(OBJS)\monolib_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_laywin.obj: ..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_lboxcmn.obj: ..\src\common\lboxcmn.cpp @@ -8450,12 +8395,7 @@ $(OBJS)\monolib_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_renderer.obj: ..\src\univ\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8470,10 +8410,8 @@ $(OBJS)\monolib_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_sashwin.obj: ..\src\generic\sashwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_sckaddr.obj: ..\src\common\sckaddr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8558,10 +8496,8 @@ $(OBJS)\monolib_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\monolib_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_splash.obj: ..\src\generic\splash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_splitter.obj: ..\src\generic\splitter.cpp @@ -8715,10 +8651,8 @@ $(OBJS)\monolib_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipwin.obj: ..\src\generic\tipwin.cpp @@ -8790,8 +8724,10 @@ $(OBJS)\monolib_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_valgen.obj: ..\src\common\valgen.cpp @@ -8851,10 +8787,8 @@ $(OBJS)\monolib_winpars.obj: ..\src\html\winpars.cpp $(OBJS)\monolib_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wizard.obj: ..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_wxchar.obj: ..\src\common\wxchar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -9314,6 +9248,21 @@ $(OBJS)\xmllib_dummy.obj: ..\src\msw\dummy.cpp $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $** +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28) /LIBPATH:$(LIBDIRNAME) @<< + $(ADVDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(ADVLIB_OBJECTS) +<< +!endif + !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28) /LIBPATH:$(LIBDIRNAME) @<< @@ -9350,6 +9299,9 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib diff --git a/build/makefile.wat b/build/makefile.wat index edba1ebfb4..56eb7b8889 100644 --- a/build/makefile.wat +++ b/build/makefile.wat @@ -197,12 +197,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & $(OBJS)\monolib_region.obj & + $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & $(OBJS)\monolib_taskbar.obj & $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & + $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_wave.obj & $(OBJS)\monolib_window.obj & $(OBJS)\monolib_statusbr.obj & @@ -240,7 +242,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_printwin.obj & $(OBJS)\monolib_radiobox.obj & $(OBJS)\monolib_radiobut.obj & - $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_scrolbar.obj & $(OBJS)\monolib_slider95.obj & $(OBJS)\monolib_spinbutt.obj & @@ -255,7 +256,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_textctrl.obj & $(OBJS)\monolib_tglbtn.obj & $(OBJS)\monolib_treectrl.obj & - $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_accesscmn.obj & $(OBJS)\monolib_appcmn.obj & $(OBJS)\monolib_artprov.obj & @@ -270,7 +270,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_ctrlcmn.obj & $(OBJS)\monolib_ctrlsub.obj & $(OBJS)\monolib_datacmn.obj & - $(OBJS)\monolib_dbgrid.obj & $(OBJS)\monolib_dcbase.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & @@ -329,36 +328,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_wincmn.obj & $(OBJS)\monolib_xpmdecod.obj & $(OBJS)\monolib_busyinfo.obj & - $(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_choicdgg.obj & - $(OBJS)\monolib_dcbuffer.obj & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_grid.obj & - $(OBJS)\monolib_gridctrl.obj & - $(OBJS)\monolib_gridsel.obj & - $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_laywin.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & $(OBJS)\monolib_progdlgg.obj & $(OBJS)\monolib_renderg.obj & - $(OBJS)\monolib_sashwin.obj & $(OBJS)\monolib_scrlwing.obj & $(OBJS)\monolib_selstore.obj & $(OBJS)\monolib_spinctlg.obj & - $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_splitter.obj & $(OBJS)\monolib_tbarsmpl.obj & $(OBJS)\monolib_textdlgg.obj & - $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_tipwin.obj & $(OBJS)\monolib_treectlg.obj & $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj & - $(OBJS)\monolib_wizard.obj + $(OBJS)\monolib_vscroll.obj !endif !endif !ifeq USE_GUI 1 @@ -404,12 +392,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & $(OBJS)\monolib_region.obj & + $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & $(OBJS)\monolib_taskbar.obj & $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & + $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_wave.obj & $(OBJS)\monolib_window.obj & $(OBJS)\monolib_textctrl.obj & @@ -433,6 +423,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_colschem.obj & $(OBJS)\monolib_combobox.obj & $(OBJS)\monolib_control.obj & + $(OBJS)\monolib_ctrlrend.obj & $(OBJS)\monolib_dialog.obj & $(OBJS)\monolib_framuniv.obj & $(OBJS)\monolib_gauge.obj & @@ -443,7 +434,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_notebook.obj & $(OBJS)\monolib_radiobox.obj & $(OBJS)\monolib_radiobut.obj & - $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_scrarrow.obj & $(OBJS)\monolib_scrolbar.obj & $(OBJS)\monolib_scrthumb.obj & @@ -475,7 +465,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_ctrlcmn.obj & $(OBJS)\monolib_ctrlsub.obj & $(OBJS)\monolib_datacmn.obj & - $(OBJS)\monolib_dbgrid.obj & $(OBJS)\monolib_dcbase.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & @@ -534,36 +523,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_wincmn.obj & $(OBJS)\monolib_xpmdecod.obj & $(OBJS)\monolib_busyinfo.obj & - $(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_choicdgg.obj & - $(OBJS)\monolib_dcbuffer.obj & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_grid.obj & - $(OBJS)\monolib_gridctrl.obj & - $(OBJS)\monolib_gridsel.obj & - $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_laywin.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & $(OBJS)\monolib_progdlgg.obj & $(OBJS)\monolib_renderg.obj & - $(OBJS)\monolib_sashwin.obj & $(OBJS)\monolib_scrlwing.obj & $(OBJS)\monolib_selstore.obj & $(OBJS)\monolib_spinctlg.obj & - $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_splitter.obj & $(OBJS)\monolib_tbarsmpl.obj & $(OBJS)\monolib_textdlgg.obj & - $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_tipwin.obj & $(OBJS)\monolib_treectlg.obj & $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj & - $(OBJS)\monolib_wizard.obj + $(OBJS)\monolib_vscroll.obj !endif !endif ____CORE_SRC_FILENAMES_2_OBJECTS = @@ -610,12 +588,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & $(OBJS)\coredll_region.obj & + $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & $(OBJS)\coredll_taskbar.obj & $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & + $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_wave.obj & $(OBJS)\coredll_window.obj & $(OBJS)\coredll_statusbr.obj & @@ -653,7 +633,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_printwin.obj & $(OBJS)\coredll_radiobox.obj & $(OBJS)\coredll_radiobut.obj & - $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_scrolbar.obj & $(OBJS)\coredll_slider95.obj & $(OBJS)\coredll_spinbutt.obj & @@ -668,7 +647,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_textctrl.obj & $(OBJS)\coredll_tglbtn.obj & $(OBJS)\coredll_treectrl.obj & - $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_accesscmn.obj & $(OBJS)\coredll_appcmn.obj & $(OBJS)\coredll_artprov.obj & @@ -683,7 +661,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_ctrlcmn.obj & $(OBJS)\coredll_ctrlsub.obj & $(OBJS)\coredll_datacmn.obj & - $(OBJS)\coredll_dbgrid.obj & $(OBJS)\coredll_dcbase.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & @@ -742,36 +719,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_wincmn.obj & $(OBJS)\coredll_xpmdecod.obj & $(OBJS)\coredll_busyinfo.obj & - $(OBJS)\coredll_calctrl.obj & $(OBJS)\coredll_choicdgg.obj & - $(OBJS)\coredll_dcbuffer.obj & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_grid.obj & - $(OBJS)\coredll_gridctrl.obj & - $(OBJS)\coredll_gridsel.obj & - $(OBJS)\coredll_helpext.obj & - $(OBJS)\coredll_laywin.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & $(OBJS)\coredll_progdlgg.obj & $(OBJS)\coredll_renderg.obj & - $(OBJS)\coredll_sashwin.obj & $(OBJS)\coredll_scrlwing.obj & $(OBJS)\coredll_selstore.obj & $(OBJS)\coredll_spinctlg.obj & - $(OBJS)\coredll_splash.obj & $(OBJS)\coredll_splitter.obj & $(OBJS)\coredll_tbarsmpl.obj & $(OBJS)\coredll_textdlgg.obj & - $(OBJS)\coredll_tipdlg.obj & $(OBJS)\coredll_tipwin.obj & $(OBJS)\coredll_treectlg.obj & $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj & - $(OBJS)\coredll_wizard.obj + $(OBJS)\coredll_vscroll.obj !endif !endif !ifeq USE_GUI 1 @@ -817,12 +783,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & $(OBJS)\coredll_region.obj & + $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & $(OBJS)\coredll_taskbar.obj & $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & + $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_wave.obj & $(OBJS)\coredll_window.obj & $(OBJS)\coredll_textctrl.obj & @@ -846,6 +814,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_colschem.obj & $(OBJS)\coredll_combobox.obj & $(OBJS)\coredll_control.obj & + $(OBJS)\coredll_ctrlrend.obj & $(OBJS)\coredll_dialog.obj & $(OBJS)\coredll_framuniv.obj & $(OBJS)\coredll_gauge.obj & @@ -856,7 +825,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_notebook.obj & $(OBJS)\coredll_radiobox.obj & $(OBJS)\coredll_radiobut.obj & - $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_scrarrow.obj & $(OBJS)\coredll_scrolbar.obj & $(OBJS)\coredll_scrthumb.obj & @@ -888,7 +856,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_ctrlcmn.obj & $(OBJS)\coredll_ctrlsub.obj & $(OBJS)\coredll_datacmn.obj & - $(OBJS)\coredll_dbgrid.obj & $(OBJS)\coredll_dcbase.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & @@ -947,36 +914,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_wincmn.obj & $(OBJS)\coredll_xpmdecod.obj & $(OBJS)\coredll_busyinfo.obj & - $(OBJS)\coredll_calctrl.obj & $(OBJS)\coredll_choicdgg.obj & - $(OBJS)\coredll_dcbuffer.obj & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_grid.obj & - $(OBJS)\coredll_gridctrl.obj & - $(OBJS)\coredll_gridsel.obj & - $(OBJS)\coredll_helpext.obj & - $(OBJS)\coredll_laywin.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & $(OBJS)\coredll_progdlgg.obj & $(OBJS)\coredll_renderg.obj & - $(OBJS)\coredll_sashwin.obj & $(OBJS)\coredll_scrlwing.obj & $(OBJS)\coredll_selstore.obj & $(OBJS)\coredll_spinctlg.obj & - $(OBJS)\coredll_splash.obj & $(OBJS)\coredll_splitter.obj & $(OBJS)\coredll_tbarsmpl.obj & $(OBJS)\coredll_textdlgg.obj & - $(OBJS)\coredll_tipdlg.obj & $(OBJS)\coredll_tipwin.obj & $(OBJS)\coredll_treectlg.obj & $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj & - $(OBJS)\coredll_wizard.obj + $(OBJS)\coredll_vscroll.obj !endif !endif ____CORE_SRC_FILENAMES_3_OBJECTS = @@ -1023,12 +979,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & $(OBJS)\corelib_region.obj & + $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & $(OBJS)\corelib_taskbar.obj & $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & + $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_wave.obj & $(OBJS)\corelib_window.obj & $(OBJS)\corelib_statusbr.obj & @@ -1066,7 +1024,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_printwin.obj & $(OBJS)\corelib_radiobox.obj & $(OBJS)\corelib_radiobut.obj & - $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_scrolbar.obj & $(OBJS)\corelib_slider95.obj & $(OBJS)\corelib_spinbutt.obj & @@ -1081,7 +1038,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_textctrl.obj & $(OBJS)\corelib_tglbtn.obj & $(OBJS)\corelib_treectrl.obj & - $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_accesscmn.obj & $(OBJS)\corelib_appcmn.obj & $(OBJS)\corelib_artprov.obj & @@ -1096,7 +1052,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_ctrlcmn.obj & $(OBJS)\corelib_ctrlsub.obj & $(OBJS)\corelib_datacmn.obj & - $(OBJS)\corelib_dbgrid.obj & $(OBJS)\corelib_dcbase.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & @@ -1155,36 +1110,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_wincmn.obj & $(OBJS)\corelib_xpmdecod.obj & $(OBJS)\corelib_busyinfo.obj & - $(OBJS)\corelib_calctrl.obj & $(OBJS)\corelib_choicdgg.obj & - $(OBJS)\corelib_dcbuffer.obj & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_grid.obj & - $(OBJS)\corelib_gridctrl.obj & - $(OBJS)\corelib_gridsel.obj & - $(OBJS)\corelib_helpext.obj & - $(OBJS)\corelib_laywin.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & $(OBJS)\corelib_progdlgg.obj & $(OBJS)\corelib_renderg.obj & - $(OBJS)\corelib_sashwin.obj & $(OBJS)\corelib_scrlwing.obj & $(OBJS)\corelib_selstore.obj & $(OBJS)\corelib_spinctlg.obj & - $(OBJS)\corelib_splash.obj & $(OBJS)\corelib_splitter.obj & $(OBJS)\corelib_tbarsmpl.obj & $(OBJS)\corelib_textdlgg.obj & - $(OBJS)\corelib_tipdlg.obj & $(OBJS)\corelib_tipwin.obj & $(OBJS)\corelib_treectlg.obj & $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj & - $(OBJS)\corelib_wizard.obj + $(OBJS)\corelib_vscroll.obj !endif !endif !ifeq USE_GUI 1 @@ -1230,12 +1174,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & $(OBJS)\corelib_region.obj & + $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & $(OBJS)\corelib_taskbar.obj & $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & + $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_wave.obj & $(OBJS)\corelib_window.obj & $(OBJS)\corelib_textctrl.obj & @@ -1259,6 +1205,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_colschem.obj & $(OBJS)\corelib_combobox.obj & $(OBJS)\corelib_control.obj & + $(OBJS)\corelib_ctrlrend.obj & $(OBJS)\corelib_dialog.obj & $(OBJS)\corelib_framuniv.obj & $(OBJS)\corelib_gauge.obj & @@ -1269,7 +1216,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_notebook.obj & $(OBJS)\corelib_radiobox.obj & $(OBJS)\corelib_radiobut.obj & - $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_scrarrow.obj & $(OBJS)\corelib_scrolbar.obj & $(OBJS)\corelib_scrthumb.obj & @@ -1301,7 +1247,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_ctrlcmn.obj & $(OBJS)\corelib_ctrlsub.obj & $(OBJS)\corelib_datacmn.obj & - $(OBJS)\corelib_dbgrid.obj & $(OBJS)\corelib_dcbase.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & @@ -1360,36 +1305,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_wincmn.obj & $(OBJS)\corelib_xpmdecod.obj & $(OBJS)\corelib_busyinfo.obj & - $(OBJS)\corelib_calctrl.obj & $(OBJS)\corelib_choicdgg.obj & - $(OBJS)\corelib_dcbuffer.obj & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_grid.obj & - $(OBJS)\corelib_gridctrl.obj & - $(OBJS)\corelib_gridsel.obj & - $(OBJS)\corelib_helpext.obj & - $(OBJS)\corelib_laywin.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & $(OBJS)\corelib_progdlgg.obj & $(OBJS)\corelib_renderg.obj & - $(OBJS)\corelib_sashwin.obj & $(OBJS)\corelib_scrlwing.obj & $(OBJS)\corelib_selstore.obj & $(OBJS)\corelib_spinctlg.obj & - $(OBJS)\corelib_splash.obj & $(OBJS)\corelib_splitter.obj & $(OBJS)\corelib_tbarsmpl.obj & $(OBJS)\corelib_textdlgg.obj & - $(OBJS)\corelib_tipdlg.obj & $(OBJS)\corelib_tipwin.obj & $(OBJS)\corelib_treectlg.obj & $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj & - $(OBJS)\corelib_wizard.obj + $(OBJS)\corelib_vscroll.obj !endif !endif ____CORE_SRC_FILENAMES_OBJECTS = @@ -1436,12 +1370,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & $(OBJS)\monodll_region.obj & + $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & $(OBJS)\monodll_taskbar.obj & $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & + $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_wave.obj & $(OBJS)\monodll_window.obj & $(OBJS)\monodll_statusbr.obj & @@ -1479,7 +1415,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_printwin.obj & $(OBJS)\monodll_radiobox.obj & $(OBJS)\monodll_radiobut.obj & - $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_scrolbar.obj & $(OBJS)\monodll_slider95.obj & $(OBJS)\monodll_spinbutt.obj & @@ -1494,7 +1429,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_textctrl.obj & $(OBJS)\monodll_tglbtn.obj & $(OBJS)\monodll_treectrl.obj & - $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_accesscmn.obj & $(OBJS)\monodll_appcmn.obj & $(OBJS)\monodll_artprov.obj & @@ -1509,7 +1443,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_ctrlcmn.obj & $(OBJS)\monodll_ctrlsub.obj & $(OBJS)\monodll_datacmn.obj & - $(OBJS)\monodll_dbgrid.obj & $(OBJS)\monodll_dcbase.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & @@ -1568,36 +1501,25 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_wincmn.obj & $(OBJS)\monodll_xpmdecod.obj & $(OBJS)\monodll_busyinfo.obj & - $(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_choicdgg.obj & - $(OBJS)\monodll_dcbuffer.obj & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_grid.obj & - $(OBJS)\monodll_gridctrl.obj & - $(OBJS)\monodll_gridsel.obj & - $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_laywin.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & $(OBJS)\monodll_progdlgg.obj & $(OBJS)\monodll_renderg.obj & - $(OBJS)\monodll_sashwin.obj & $(OBJS)\monodll_scrlwing.obj & $(OBJS)\monodll_selstore.obj & $(OBJS)\monodll_spinctlg.obj & - $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_splitter.obj & $(OBJS)\monodll_tbarsmpl.obj & $(OBJS)\monodll_textdlgg.obj & - $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_tipwin.obj & $(OBJS)\monodll_treectlg.obj & $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj & - $(OBJS)\monodll_wizard.obj + $(OBJS)\monodll_vscroll.obj !endif !endif !ifeq USE_GUI 1 @@ -1643,12 +1565,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & $(OBJS)\monodll_region.obj & + $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & $(OBJS)\monodll_taskbar.obj & $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & + $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_wave.obj & $(OBJS)\monodll_window.obj & $(OBJS)\monodll_textctrl.obj & @@ -1672,6 +1596,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_colschem.obj & $(OBJS)\monodll_combobox.obj & $(OBJS)\monodll_control.obj & + $(OBJS)\monodll_ctrlrend.obj & $(OBJS)\monodll_dialog.obj & $(OBJS)\monodll_framuniv.obj & $(OBJS)\monodll_gauge.obj & @@ -1682,7 +1607,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_notebook.obj & $(OBJS)\monodll_radiobox.obj & $(OBJS)\monodll_radiobut.obj & - $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_scrarrow.obj & $(OBJS)\monodll_scrolbar.obj & $(OBJS)\monodll_scrthumb.obj & @@ -1714,7 +1638,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_ctrlcmn.obj & $(OBJS)\monodll_ctrlsub.obj & $(OBJS)\monodll_datacmn.obj & - $(OBJS)\monodll_dbgrid.obj & $(OBJS)\monodll_dcbase.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & @@ -1773,42 +1696,43 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_wincmn.obj & $(OBJS)\monodll_xpmdecod.obj & $(OBJS)\monodll_busyinfo.obj & - $(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_choicdgg.obj & - $(OBJS)\monodll_dcbuffer.obj & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_grid.obj & - $(OBJS)\monodll_gridctrl.obj & - $(OBJS)\monodll_gridsel.obj & - $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_laywin.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & $(OBJS)\monodll_progdlgg.obj & $(OBJS)\monodll_renderg.obj & - $(OBJS)\monodll_sashwin.obj & $(OBJS)\monodll_scrlwing.obj & $(OBJS)\monodll_selstore.obj & $(OBJS)\monodll_spinctlg.obj & - $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_splitter.obj & $(OBJS)\monodll_tbarsmpl.obj & $(OBJS)\monodll_textdlgg.obj & - $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_tipwin.obj & $(OBJS)\monodll_treectlg.obj & $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj & - $(OBJS)\monodll_wizard.obj + $(OBJS)\monodll_vscroll.obj !endif !endif ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = !ifeq USE_GUI 1 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(____CORE_SRC_FILENAMES_1_OBJECTS) & + $(OBJS)\monolib_dbgrid.obj & + $(OBJS)\monolib_calctrl.obj & + $(OBJS)\monolib_dcbuffer.obj & + $(OBJS)\monolib_grid.obj & + $(OBJS)\monolib_gridctrl.obj & + $(OBJS)\monolib_gridsel.obj & + $(OBJS)\monolib_helpext.obj & + $(OBJS)\monolib_laywin.obj & + $(OBJS)\monolib_sashwin.obj & + $(OBJS)\monolib_splash.obj & + $(OBJS)\monolib_tipdlg.obj & + $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_helpbest.obj & $(OBJS)\monolib_helpctrl.obj & $(OBJS)\monolib_helpdata.obj & @@ -1836,6 +1760,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(____CORE_SRC_FILENAMES_OBJECTS) & + $(OBJS)\monodll_dbgrid.obj & + $(OBJS)\monodll_calctrl.obj & + $(OBJS)\monodll_dcbuffer.obj & + $(OBJS)\monodll_grid.obj & + $(OBJS)\monodll_gridctrl.obj & + $(OBJS)\monodll_gridsel.obj & + $(OBJS)\monodll_helpext.obj & + $(OBJS)\monodll_laywin.obj & + $(OBJS)\monodll_sashwin.obj & + $(OBJS)\monodll_splash.obj & + $(OBJS)\monodll_tipdlg.obj & + $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_helpbest.obj & $(OBJS)\monodll_helpctrl.obj & $(OBJS)\monodll_helpdata.obj & @@ -1859,6 +1795,24 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_winpars.obj & $(OBJS)\monodll_htmllbox.obj !endif +__advdll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_GUI 1 +__advdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll +!endif +!endif +!endif +__advlib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_GUI 1 +__advlib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +!endif +!endif +!endif __basedll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -1984,6 +1938,45 @@ __xmllib___depname = & ### Variables: ### +ADVDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & + -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex & + -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_advdll.pch +ADVDLL_OBJECTS = & + $(OBJS)\advdll_dummy.obj & + $(OBJS)\advdll_dbgrid.obj & + $(OBJS)\advdll_calctrl.obj & + $(OBJS)\advdll_dcbuffer.obj & + $(OBJS)\advdll_grid.obj & + $(OBJS)\advdll_gridctrl.obj & + $(OBJS)\advdll_gridsel.obj & + $(OBJS)\advdll_helpext.obj & + $(OBJS)\advdll_laywin.obj & + $(OBJS)\advdll_sashwin.obj & + $(OBJS)\advdll_splash.obj & + $(OBJS)\advdll_tipdlg.obj & + $(OBJS)\advdll_wizard.obj +ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & + -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex & + -i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_advlib.pch +ADVLIB_OBJECTS = & + $(OBJS)\advlib_dummy.obj & + $(OBJS)\advlib_dbgrid.obj & + $(OBJS)\advlib_calctrl.obj & + $(OBJS)\advlib_dcbuffer.obj & + $(OBJS)\advlib_grid.obj & + $(OBJS)\advlib_gridctrl.obj & + $(OBJS)\advlib_gridsel.obj & + $(OBJS)\advlib_helpext.obj & + $(OBJS)\advlib_laywin.obj & + $(OBJS)\advlib_sashwin.obj & + $(OBJS)\advlib_splash.obj & + $(OBJS)\advlib_tipdlg.obj & + $(OBJS)\advlib_wizard.obj BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & @@ -2668,7 +2661,85 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) + +$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\src\generic\calctrl.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_dcbuffer.obj : .AUTODEPEND ..\src\generic\dcbuffer.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_grid.obj : .AUTODEPEND ..\src\generic\grid.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_gridctrl.obj : .AUTODEPEND ..\src\generic\gridctrl.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\src\generic\calctrl.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_dcbuffer.obj : .AUTODEPEND ..\src\generic\dcbuffer.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_grid.obj : .AUTODEPEND ..\src\generic\grid.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_gridctrl.obj : .AUTODEPEND ..\src\generic\gridctrl.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\src\common\appbase.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -3191,11 +3262,6 @@ $(OBJS)\coredll_button.obj : .AUTODEPEND ..\src\msw\button.cpp !endif !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_calctrl.obj : .AUTODEPEND ..\src\generic\calctrl.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_caret.obj : .AUTODEPEND ..\src\msw\caret.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -3330,6 +3396,9 @@ $(OBJS)\coredll_ctrlcmn.obj : .AUTODEPEND ..\src\common\ctrlcmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +$(OBJS)\coredll_ctrlrend.obj : .AUTODEPEND ..\src\univ\ctrlrend.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + !ifeq USE_GUI 1 $(OBJS)\coredll_ctrlsub.obj : .AUTODEPEND ..\src\common\ctrlsub.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -3355,11 +3424,6 @@ $(OBJS)\coredll_dataobj.obj : .AUTODEPEND ..\src\msw\ole\dataobj.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_dc.obj : .AUTODEPEND ..\src\msw\dc.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -3370,11 +3434,6 @@ $(OBJS)\coredll_dcbase.obj : .AUTODEPEND ..\src\common\dcbase.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcbuffer.obj : .AUTODEPEND ..\src\generic\dcbuffer.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_dcclient.obj : .AUTODEPEND ..\src\msw\dcclient.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -3627,21 +3686,6 @@ $(OBJS)\coredll_gifdecod.obj : .AUTODEPEND ..\src\common\gifdecod.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_grid.obj : .AUTODEPEND ..\src\generic\grid.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gridctrl.obj : .AUTODEPEND ..\src\generic\gridctrl.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - $(OBJS)\coredll_gtk.obj : .AUTODEPEND ..\src\univ\themes\gtk.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -3655,11 +3699,6 @@ $(OBJS)\coredll_helpchm.obj : .AUTODEPEND ..\src\msw\helpchm.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\src\msw\helpwin.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -3768,11 +3807,6 @@ $(OBJS)\coredll_layout.obj : .AUTODEPEND ..\src\common\layout.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_lboxcmn.obj : .AUTODEPEND ..\src\common\lboxcmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4006,18 +4040,9 @@ $(OBJS)\coredll_rendcmn.obj : .AUTODEPEND ..\src\common\rendcmn.cpp !endif !ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_renderer.obj : .AUTODEPEND ..\src\univ\renderer.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 $(OBJS)\coredll_renderer.obj : .AUTODEPEND ..\src\msw\renderer.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!endif !ifeq USE_GUI 1 $(OBJS)\coredll_renderg.obj : .AUTODEPEND ..\src\generic\renderg.cpp @@ -4029,11 +4054,6 @@ $(OBJS)\coredll_rgncmn.obj : .AUTODEPEND ..\src\common\rgncmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - $(OBJS)\coredll_scrarrow.obj : .AUTODEPEND ..\src\univ\scrarrow.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4107,11 +4127,6 @@ $(OBJS)\coredll_spinctlg.obj : .AUTODEPEND ..\src\generic\spinctlg.cpp $(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\src\msw\spinctrl.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\coredll_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_splitter.obj : .AUTODEPEND ..\src\generic\splitter.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4264,11 +4279,6 @@ $(OBJS)\coredll_timercmn.obj : .AUTODEPEND ..\src\common\timercmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_tipwin.obj : .AUTODEPEND ..\src\generic\tipwin.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4321,8 +4331,10 @@ $(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\src\msw\ole\uuid.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\coredll_uxtheme.obj : .AUTODEPEND ..\src\msw\uxtheme.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\coredll_valgen.obj : .AUTODEPEND ..\src\common\valgen.cpp @@ -4373,11 +4385,6 @@ $(OBJS)\coredll_window.obj : .AUTODEPEND ..\src\msw\window.cpp $(OBJS)\coredll_winuniv.obj : .AUTODEPEND ..\src\univ\winuniv.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\coredll_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_xpmdecod.obj : .AUTODEPEND ..\src\common\xpmdecod.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4478,11 +4485,6 @@ $(OBJS)\corelib_button.obj : .AUTODEPEND ..\src\msw\button.cpp !endif !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_calctrl.obj : .AUTODEPEND ..\src\generic\calctrl.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_caret.obj : .AUTODEPEND ..\src\msw\caret.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -4617,6 +4619,9 @@ $(OBJS)\corelib_ctrlcmn.obj : .AUTODEPEND ..\src\common\ctrlcmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +$(OBJS)\corelib_ctrlrend.obj : .AUTODEPEND ..\src\univ\ctrlrend.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + !ifeq USE_GUI 1 $(OBJS)\corelib_ctrlsub.obj : .AUTODEPEND ..\src\common\ctrlsub.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -4642,11 +4647,6 @@ $(OBJS)\corelib_dataobj.obj : .AUTODEPEND ..\src\msw\ole\dataobj.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_dc.obj : .AUTODEPEND ..\src\msw\dc.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -4657,11 +4657,6 @@ $(OBJS)\corelib_dcbase.obj : .AUTODEPEND ..\src\common\dcbase.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcbuffer.obj : .AUTODEPEND ..\src\generic\dcbuffer.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_dcclient.obj : .AUTODEPEND ..\src\msw\dcclient.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -4914,21 +4909,6 @@ $(OBJS)\corelib_gifdecod.obj : .AUTODEPEND ..\src\common\gifdecod.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_grid.obj : .AUTODEPEND ..\src\generic\grid.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gridctrl.obj : .AUTODEPEND ..\src\generic\gridctrl.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - $(OBJS)\corelib_gtk.obj : .AUTODEPEND ..\src\univ\themes\gtk.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -4942,11 +4922,6 @@ $(OBJS)\corelib_helpchm.obj : .AUTODEPEND ..\src\msw\helpchm.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\src\msw\helpwin.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5055,11 +5030,6 @@ $(OBJS)\corelib_layout.obj : .AUTODEPEND ..\src\common\layout.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_lboxcmn.obj : .AUTODEPEND ..\src\common\lboxcmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5293,18 +5263,9 @@ $(OBJS)\corelib_rendcmn.obj : .AUTODEPEND ..\src\common\rendcmn.cpp !endif !ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_renderer.obj : .AUTODEPEND ..\src\univ\renderer.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 $(OBJS)\corelib_renderer.obj : .AUTODEPEND ..\src\msw\renderer.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!endif !ifeq USE_GUI 1 $(OBJS)\corelib_renderg.obj : .AUTODEPEND ..\src\generic\renderg.cpp @@ -5316,11 +5277,6 @@ $(OBJS)\corelib_rgncmn.obj : .AUTODEPEND ..\src\common\rgncmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - $(OBJS)\corelib_scrarrow.obj : .AUTODEPEND ..\src\univ\scrarrow.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5394,11 +5350,6 @@ $(OBJS)\corelib_spinctlg.obj : .AUTODEPEND ..\src\generic\spinctlg.cpp $(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\src\msw\spinctrl.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\corelib_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_splitter.obj : .AUTODEPEND ..\src\generic\splitter.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5551,11 +5502,6 @@ $(OBJS)\corelib_timercmn.obj : .AUTODEPEND ..\src\common\timercmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_tipwin.obj : .AUTODEPEND ..\src\generic\tipwin.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5608,8 +5554,10 @@ $(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\src\msw\ole\uuid.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\corelib_uxtheme.obj : .AUTODEPEND ..\src\msw\uxtheme.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\corelib_valgen.obj : .AUTODEPEND ..\src\common\valgen.cpp @@ -5660,11 +5608,6 @@ $(OBJS)\corelib_window.obj : .AUTODEPEND ..\src\msw\window.cpp $(OBJS)\corelib_winuniv.obj : .AUTODEPEND ..\src\univ\winuniv.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\corelib_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_xpmdecod.obj : .AUTODEPEND ..\src\common\xpmdecod.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5921,10 +5864,8 @@ $(OBJS)\monodll_button.obj : .AUTODEPEND ..\src\msw\button.cpp !endif !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\src\generic\calctrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_caret.obj : .AUTODEPEND ..\src\msw\caret.cpp @@ -6072,6 +6013,9 @@ $(OBJS)\monodll_ctrlcmn.obj : .AUTODEPEND ..\src\common\ctrlcmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +$(OBJS)\monodll_ctrlrend.obj : .AUTODEPEND ..\src\univ\ctrlrend.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + !ifeq USE_GUI 1 $(OBJS)\monodll_ctrlsub.obj : .AUTODEPEND ..\src\common\ctrlsub.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6106,10 +6050,8 @@ $(OBJS)\monodll_datstrm.obj : .AUTODEPEND ..\src\common\datstrm.cpp $(OBJS)\monodll_db.obj : .AUTODEPEND ..\src\common\db.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monodll_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_dbtable.obj : .AUTODEPEND ..\src\common\dbtable.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6124,10 +6066,8 @@ $(OBJS)\monodll_dcbase.obj : .AUTODEPEND ..\src\common\dcbase.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_dcbuffer.obj : .AUTODEPEND ..\src\generic\dcbuffer.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_dcclient.obj : .AUTODEPEND ..\src\msw\dcclient.cpp @@ -6435,20 +6375,14 @@ $(OBJS)\monodll_gifdecod.obj : .AUTODEPEND ..\src\common\gifdecod.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_grid.obj : .AUTODEPEND ..\src\generic\grid.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!ifeq USE_GUI 1 $(OBJS)\monodll_gridctrl.obj : .AUTODEPEND ..\src\generic\gridctrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!ifeq USE_GUI 1 $(OBJS)\monodll_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\src\msw\gsocket.c $(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $< @@ -6484,10 +6418,8 @@ $(OBJS)\monodll_helpctrl.obj : .AUTODEPEND ..\src\html\helpctrl.cpp $(OBJS)\monodll_helpdata.obj : .AUTODEPEND ..\src\html\helpdata.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monodll_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_helpfrm.obj : .AUTODEPEND ..\src\html\helpfrm.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6633,10 +6565,8 @@ $(OBJS)\monodll_layout.obj : .AUTODEPEND ..\src\common\layout.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_lboxcmn.obj : .AUTODEPEND ..\src\common\lboxcmn.cpp @@ -6943,18 +6873,9 @@ $(OBJS)\monodll_rendcmn.obj : .AUTODEPEND ..\src\common\rendcmn.cpp !endif !ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_renderer.obj : .AUTODEPEND ..\src\univ\renderer.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 $(OBJS)\monodll_renderer.obj : .AUTODEPEND ..\src\msw\renderer.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_renderg.obj : .AUTODEPEND ..\src\generic\renderg.cpp @@ -6966,10 +6887,8 @@ $(OBJS)\monodll_rgncmn.obj : .AUTODEPEND ..\src\common\rgncmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_sckaddr.obj : .AUTODEPEND ..\src\common\sckaddr.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7062,10 +6981,8 @@ $(OBJS)\monodll_spinctlg.obj : .AUTODEPEND ..\src\generic\spinctlg.cpp $(OBJS)\monodll_spinctrl.obj : .AUTODEPEND ..\src\msw\spinctrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monodll_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_splitter.obj : .AUTODEPEND ..\src\generic\splitter.cpp @@ -7243,10 +7160,8 @@ $(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\src\common\timercmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_tipwin.obj : .AUTODEPEND ..\src\generic\tipwin.cpp @@ -7318,8 +7233,10 @@ $(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\src\msw\ole\uuid.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\monodll_uxtheme.obj : .AUTODEPEND ..\src\msw\uxtheme.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\monodll_valgen.obj : .AUTODEPEND ..\src\common\valgen.cpp @@ -7379,10 +7296,8 @@ $(OBJS)\monodll_winpars.obj : .AUTODEPEND ..\src\html\winpars.cpp $(OBJS)\monodll_winuniv.obj : .AUTODEPEND ..\src\univ\winuniv.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_wxchar.obj : .AUTODEPEND ..\src\common\wxchar.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7502,10 +7417,8 @@ $(OBJS)\monolib_button.obj : .AUTODEPEND ..\src\msw\button.cpp !endif !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\src\generic\calctrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_caret.obj : .AUTODEPEND ..\src\msw\caret.cpp @@ -7653,6 +7566,9 @@ $(OBJS)\monolib_ctrlcmn.obj : .AUTODEPEND ..\src\common\ctrlcmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +$(OBJS)\monolib_ctrlrend.obj : .AUTODEPEND ..\src\univ\ctrlrend.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + !ifeq USE_GUI 1 $(OBJS)\monolib_ctrlsub.obj : .AUTODEPEND ..\src\common\ctrlsub.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7687,10 +7603,8 @@ $(OBJS)\monolib_datstrm.obj : .AUTODEPEND ..\src\common\datstrm.cpp $(OBJS)\monolib_db.obj : .AUTODEPEND ..\src\common\db.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monolib_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_dbtable.obj : .AUTODEPEND ..\src\common\dbtable.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7705,10 +7619,8 @@ $(OBJS)\monolib_dcbase.obj : .AUTODEPEND ..\src\common\dcbase.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_dcbuffer.obj : .AUTODEPEND ..\src\generic\dcbuffer.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_dcclient.obj : .AUTODEPEND ..\src\msw\dcclient.cpp @@ -8016,20 +7928,14 @@ $(OBJS)\monolib_gifdecod.obj : .AUTODEPEND ..\src\common\gifdecod.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_grid.obj : .AUTODEPEND ..\src\generic\grid.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!ifeq USE_GUI 1 $(OBJS)\monolib_gridctrl.obj : .AUTODEPEND ..\src\generic\gridctrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!ifeq USE_GUI 1 $(OBJS)\monolib_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\src\msw\gsocket.c $(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $< @@ -8065,10 +7971,8 @@ $(OBJS)\monolib_helpctrl.obj : .AUTODEPEND ..\src\html\helpctrl.cpp $(OBJS)\monolib_helpdata.obj : .AUTODEPEND ..\src\html\helpdata.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monolib_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_helpfrm.obj : .AUTODEPEND ..\src\html\helpfrm.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8214,10 +8118,8 @@ $(OBJS)\monolib_layout.obj : .AUTODEPEND ..\src\common\layout.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_lboxcmn.obj : .AUTODEPEND ..\src\common\lboxcmn.cpp @@ -8524,18 +8426,9 @@ $(OBJS)\monolib_rendcmn.obj : .AUTODEPEND ..\src\common\rendcmn.cpp !endif !ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_renderer.obj : .AUTODEPEND ..\src\univ\renderer.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 $(OBJS)\monolib_renderer.obj : .AUTODEPEND ..\src\msw\renderer.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_renderg.obj : .AUTODEPEND ..\src\generic\renderg.cpp @@ -8547,10 +8440,8 @@ $(OBJS)\monolib_rgncmn.obj : .AUTODEPEND ..\src\common\rgncmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_sckaddr.obj : .AUTODEPEND ..\src\common\sckaddr.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8643,10 +8534,8 @@ $(OBJS)\monolib_spinctlg.obj : .AUTODEPEND ..\src\generic\spinctlg.cpp $(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\src\msw\spinctrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monolib_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_splitter.obj : .AUTODEPEND ..\src\generic\splitter.cpp @@ -8824,10 +8713,8 @@ $(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\src\common\timercmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_tipwin.obj : .AUTODEPEND ..\src\generic\tipwin.cpp @@ -8899,8 +8786,10 @@ $(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\src\msw\ole\uuid.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\monolib_uxtheme.obj : .AUTODEPEND ..\src\msw\uxtheme.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\monolib_valgen.obj : .AUTODEPEND ..\src\common\valgen.cpp @@ -8960,10 +8849,8 @@ $(OBJS)\monolib_winpars.obj : .AUTODEPEND ..\src\html\winpars.cpp $(OBJS)\monolib_winuniv.obj : .AUTODEPEND ..\src\univ\winuniv.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_wxchar.obj : .AUTODEPEND ..\src\common\wxchar.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9423,6 +9310,36 @@ $(OBJS)\xmllib_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp $(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\src\xml\xml.cpp $(CXX) -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_GUI 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) + @%create $(OBJS)\advdll.lbc + @%append $(OBJS)\advdll.lbc option quiet + @%append $(OBJS)\advdll.lbc name $^@ + @%append $(OBJS)\advdll.lbc option incremental + @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) + @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i + @%append $(OBJS)\advdll.lbc + @%append $(OBJS)\advdll.lbc system nt_dll + wlink @$(OBJS)\advdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +$^@ +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_GUI 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib : $(ADVLIB_OBJECTS) + @%create $(OBJS)\advlib.lbc + @for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\advlib.lbc +!endif +!endif +!endif + !ifeq MONOLITHIC 0 !ifeq SHARED 1 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @@ -9472,6 +9389,9 @@ clean : .SYMBOLIC -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib diff --git a/build/wx.dsw b/build/wx.dsw index 09580875b2..c268a092e9 100644 --- a/build/wx.dsw +++ b/build/wx.dsw @@ -2,6 +2,54 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### +Project: "advdll"=wx_advdll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +Begin Project Dependency +Project_Dep_Name wxtiff +End Project Dependency +Begin Project Dependency +Project_Dep_Name wxjpeg +End Project Dependency +Begin Project Dependency +Project_Dep_Name wxpng +End Project Dependency +Begin Project Dependency +Project_Dep_Name wxexpat +End Project Dependency +Begin Project Dependency +Project_Dep_Name wxzlib +End Project Dependency +Begin Project Dependency +Project_Dep_Name wxregex +End Project Dependency +Begin Project Dependency +Project_Dep_Name coredll +End Project Dependency +Begin Project Dependency +Project_Dep_Name basedll +End Project Dependency +}}} + +############################################################################### + +Project: "advlib"=wx_advlib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "basedll"=wx_basedll.dsp - Package Owner=<4> Package=<5> diff --git a/build/wx_advdll.dsp b/build/wx_advdll.dsp new file mode 100644 index 0000000000..247b596391 --- /dev/null +++ b/build/wx_advdll.dsp @@ -0,0 +1,394 @@ +# Microsoft Developer Studio Project File - Name="advdll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=advdll - Win32 DLL Native Debug Unicode +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "wx_advdll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "wx_advdll.mak" CFG="advdll - Win32 DLL Native Debug Unicode" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "advdll - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "advdll - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "advdll - Win32 DLL Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswuddll\wxmsw25ud_core.lib ..\lib\vc_mswuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxmsw250ud_adv_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxmsw25ud_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswuddll\wxmsw25ud_core.lib ..\lib\vc_mswuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxmsw250ud_adv_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxmsw25ud_adv.lib" /debug + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Intermediate_Dir "vc_mswdll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Intermediate_Dir "vc_mswdll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\lib\vc_mswdll\wxmsw250_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\lib\vc_mswdll\wxmsw250_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswdll\wxmsw25_core.lib ..\lib\vc_mswdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxmsw250_adv_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxmsw25_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswdll\wxmsw25_core.lib ..\lib\vc_mswdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxmsw250_adv_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxmsw25_adv.lib" + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Intermediate_Dir "vc_mswunivuddll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxmswuniv250ud_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxmswuniv25ud_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxmswuniv250ud_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxmswuniv25ud_adv.lib" /debug + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivudll\wxmswuniv25u_core.lib ..\lib\vc_mswunivudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxmswuniv250u_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxmswuniv25u_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivudll\wxmswuniv25u_core.lib ..\lib\vc_mswunivudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxmswuniv250u_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxmswuniv25u_adv.lib" + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Intermediate_Dir "vc_mswddll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Intermediate_Dir "vc_mswddll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswddll\wxmsw25d_core.lib ..\lib\vc_mswddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxmsw250d_adv_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxmsw25d_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswddll\wxmsw25d_core.lib ..\lib\vc_mswddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxmsw250d_adv_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxmsw25d_adv.lib" /debug + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Intermediate_Dir "vc_mswunivdll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Intermediate_Dir "vc_mswunivdll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxmswuniv250_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxmswuniv25_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxmswuniv250_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxmswuniv25_adv.lib" + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Intermediate_Dir "vc_mswunivddll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Intermediate_Dir "vc_mswunivddll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxmswuniv250d_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxmswuniv25d_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxmswuniv250d_adv_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxmswuniv25d_adv.lib" /debug + +!ELSEIF "$(CFG)" == "advdll - Win32 DLL Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Intermediate_Dir "vc_mswudll\advdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Intermediate_Dir "vc_mswudll\advdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_adv_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswudll\wxmsw25u_core.lib ..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxmsw250u_adv_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxmsw25u_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\lib\vc_mswudll\wxmsw25u_core.lib ..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxmsw250u_adv_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxmsw25u_adv.lib" + +!ENDIF + +# Begin Target + +# Name "advdll - Win32 DLL Native Debug Unicode" +# Name "advdll - Win32 DLL Native Release Ansi" +# Name "advdll - Win32 DLL wxUniv Debug Unicode" +# Name "advdll - Win32 DLL wxUniv Release Unicode" +# Name "advdll - Win32 DLL Native Debug Ansi" +# Name "advdll - Win32 DLL wxUniv Release Ansi" +# Name "advdll - Win32 DLL wxUniv Debug Ansi" +# Name "advdll - Win32 DLL Native Release Unicode" +# Begin Group "Common Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\calctrl.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\dbgrid.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\dcbuffer.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\calctrl.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\grid.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\gridctrl.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\gridsel.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\helpext.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\laywin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\sashwin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\splash.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\wizard.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\grid.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\laywin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\sashwin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\splash.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\tipdlg.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\wizard.h +# End Source File +# End Group +# Begin Group "Generic Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\src\generic\calctrl.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\dcbuffer.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\grid.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\gridctrl.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\gridsel.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\helpext.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\laywin.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\sashwin.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\splash.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\tipdlg.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\wizard.cpp +# End Source File +# End Group +# Begin Group "Common Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\src\common\dbgrid.cpp +# End Source File +# End Group +# Begin Group "MSW Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# End Group +# End Target +# End Project + diff --git a/build/wx_advlib.dsp b/build/wx_advlib.dsp new file mode 100644 index 0000000000..8823a3d65e --- /dev/null +++ b/build/wx_advlib.dsp @@ -0,0 +1,377 @@ +# Microsoft Developer Studio Project File - Name="advlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=advlib - Win32 LIB wxUniv Release Ansi +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "wx_advlib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "wx_advlib.mak" CFG="advlib - Win32 LIB wxUniv Release Ansi" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "advlib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "advlib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "advlib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_adv.lib" + +!ELSEIF "$(CFG)" == "advlib - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\advlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\advlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_adv.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_adv.lib" + +!ENDIF + +# Begin Target + +# Name "advlib - Win32 LIB wxUniv Release Ansi" +# Name "advlib - Win32 LIB Native Release Unicode" +# Name "advlib - Win32 LIB wxUniv Debug Ansi" +# Name "advlib - Win32 LIB Native Release Ansi" +# Name "advlib - Win32 LIB Native Debug Unicode" +# Name "advlib - Win32 LIB wxUniv Release Unicode" +# Name "advlib - Win32 LIB wxUniv Debug Unicode" +# Name "advlib - Win32 LIB Native Debug Ansi" +# Begin Group "Common Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\calctrl.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\dbgrid.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\dcbuffer.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\calctrl.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\grid.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\gridctrl.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\gridsel.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\helpext.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\laywin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\sashwin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\splash.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\generic\wizard.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\grid.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\laywin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\sashwin.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\splash.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\tipdlg.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\wizard.h +# End Source File +# End Group +# Begin Group "Generic Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\src\generic\calctrl.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\dcbuffer.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\grid.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\gridctrl.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\gridsel.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\helpext.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\laywin.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\sashwin.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\splash.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\tipdlg.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\generic\wizard.cpp +# End Source File +# End Group +# Begin Group "Common Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\src\common\dbgrid.cpp +# End Source File +# End Group +# Begin Group "MSW Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# End Group +# End Target +# End Project + diff --git a/build/wx_basedll.dsp b/build/wx_basedll.dsp index 62b585018e..94cafc1eb2 100644 --- a/build/wx_basedll.dsp +++ b/build/wx_basedll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswuddll\" # PROP Intermediate_Dir "vc_mswuddll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -72,8 +72,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivudll\" # PROP Intermediate_Dir "vc_mswunivudll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -172,8 +172,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 @@ -222,8 +222,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\basedll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0 diff --git a/build/wx_baselib.dsp b/build/wx_baselib.dsp index 4a3f1e379f..b394fbb9d2 100644 --- a/build/wx_baselib.dsp +++ b/build/wx_baselib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=baselib - Win32 Static Native Release Unicode +CFG=baselib - Win32 LIB wxUniv Release Ansi !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,18 +13,18 @@ CFG=baselib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_baselib.mak" CFG="baselib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_baselib.mak" CFG="baselib - Win32 LIB wxUniv Release Ansi" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "baselib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "baselib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "baselib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -34,7 +34,30 @@ CFG=baselib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "baselib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "baselib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\baselib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\baselib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib" + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -46,8 +69,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswu\" # PROP Intermediate_Dir "vc_mswu\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -57,30 +80,30 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\baselib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\baselib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -92,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_msw\" # PROP Intermediate_Dir "vc_msw\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -103,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxbase25.lib" # ADD LIB32 /nologo /out:"..\lib\vc_msw\wxbase25.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -115,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswud\" # PROP Intermediate_Dir "vc_mswud\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -126,53 +149,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "baselib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" -# PROP BASE Intermediate_Dir "vc_mswunivd\baselib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" -# PROP Intermediate_Dir "vc_mswunivd\baselib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\baselib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\baselib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -184,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswd\" # PROP Intermediate_Dir "vc_mswd\baselib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -195,41 +218,109 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d.lib" -!ELSEIF "$(CFG)" == "baselib - Win32 Static wxUniv Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\baselib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\baselib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib" - !ENDIF # Begin Target -# Name "baselib - Win32 Static Native Release Unicode" -# Name "baselib - Win32 Static wxUniv Release Unicode" -# Name "baselib - Win32 Static Native Release Ansi" -# Name "baselib - Win32 Static Native Debug Unicode" -# Name "baselib - Win32 Static wxUniv Debug Ansi" -# Name "baselib - Win32 Static wxUniv Release Ansi" -# Name "baselib - Win32 Static Native Debug Ansi" -# Name "baselib - Win32 Static wxUniv Debug Unicode" +# Name "baselib - Win32 LIB wxUniv Release Ansi" +# Name "baselib - Win32 LIB Native Release Unicode" +# Name "baselib - Win32 LIB wxUniv Debug Ansi" +# Name "baselib - Win32 LIB Native Release Ansi" +# Name "baselib - Win32 LIB Native Debug Unicode" +# Name "baselib - Win32 LIB wxUniv Release Unicode" +# Name "baselib - Win32 LIB wxUniv Debug Unicode" +# Name "baselib - Win32 LIB Native Debug Ansi" +# Begin Group "Setup Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\msw\setup.h + +!IF "$(CFG)" == "baselib - Win32 LIB wxUniv Release Ansi" + +# Begin Custom Build - Creating ..\lib\vc_mswuniv\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Release Unicode" + +# Begin Custom Build - Creating ..\lib\vc_mswu\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Ansi" + +# Begin Custom Build - Creating ..\lib\vc_mswunivd\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Release Ansi" + +# Begin Custom Build - Creating ..\lib\vc_msw\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_msw\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Debug Unicode" + +# Begin Custom Build - Creating ..\lib\vc_mswud\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB wxUniv Release Unicode" + +# Begin Custom Build - Creating ..\lib\vc_mswunivu\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Unicode" + +# Begin Custom Build - Creating ..\lib\vc_mswunivud\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "baselib - Win32 LIB Native Debug Ansi" + +# Begin Custom Build - Creating ..\lib\vc_mswd\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\lib\vc_mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\vc_mswd\wx\setup.h + +# End Custom Build + +!ENDIF + +# End Source File +# End Group # Begin Group "Common Headers" # PROP Default_Filter "" diff --git a/build/wx_coredll.dsp b/build/wx_coredll.dsp index b8342a4437..3f747708f6 100644 --- a/build/wx_coredll.dsp +++ b/build/wx_coredll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswuddll\" # PROP Intermediate_Dir "vc_mswuddll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -72,8 +72,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivudll\" # PROP Intermediate_Dir "vc_mswunivudll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -172,8 +172,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -222,8 +222,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\coredll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 @@ -288,10 +288,6 @@ SOURCE=..\include\wx\button.h # End Source File # Begin Source File -SOURCE=..\include\wx\calctrl.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\caret.h # End Source File # Begin Source File @@ -356,18 +352,10 @@ SOURCE=..\include\wx\dataobj.h # End Source File # Begin Source File -SOURCE=..\include\wx\dbgrid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\dc.h # End Source File # Begin Source File -SOURCE=..\include\wx\dcbuffer.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\dcclient.h # End Source File # Begin Source File @@ -484,10 +472,6 @@ SOURCE=..\include\wx\generic\accel.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\calctrl.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\choicdgg.h # End Source File # Begin Source File @@ -524,30 +508,10 @@ SOURCE=..\include\wx\generic\fontdlgg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\grid.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\gridctrl.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\gridsel.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\helpext.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\laywin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\listctrl.h # End Source File # Begin Source File @@ -580,10 +544,6 @@ SOURCE=..\include\wx\generic\progdlgg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\sashwin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\scrolwin.h # End Source File # Begin Source File @@ -592,10 +552,6 @@ SOURCE=..\include\wx\generic\spinctlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\splash.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\splitter.h # End Source File # Begin Source File @@ -620,10 +576,6 @@ SOURCE=..\include\wx\generic\treectlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\wizard.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\geometry.h # End Source File # Begin Source File @@ -636,10 +588,6 @@ SOURCE=..\include\wx\glcanvas.h # End Source File # Begin Source File -SOURCE=..\include\wx\grid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\help.h # End Source File # Begin Source File @@ -716,10 +664,6 @@ SOURCE=..\include\wx\layout.h # End Source File # Begin Source File -SOURCE=..\include\wx\laywin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\listbase.h # End Source File # Begin Source File @@ -1216,10 +1160,6 @@ SOURCE=..\include\wx\renderer.h # End Source File # Begin Source File -SOURCE=..\include\wx\sashwin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\scopeguard.h # End Source File # Begin Source File @@ -1256,10 +1196,6 @@ SOURCE=..\include\wx\spinctrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\splash.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\splitter.h # End Source File # Begin Source File @@ -1324,10 +1260,6 @@ SOURCE=..\include\wx\timer.h # End Source File # Begin Source File -SOURCE=..\include\wx\tipdlg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\tipwin.h # End Source File # Begin Source File @@ -1532,10 +1464,6 @@ SOURCE=..\include\wx\window.h # End Source File # Begin Source File -SOURCE=..\include\wx\wizard.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\xpmdecod.h # End Source File # Begin Source File @@ -1587,10 +1515,6 @@ SOURCE=..\src\generic\busyinfo.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\calctrl.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\choicdgg.cpp # End Source File # Begin Source File @@ -1630,10 +1554,6 @@ SOURCE=..\src\generic\colrdlgg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\dcbuffer.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\dcpsg.cpp # End Source File # Begin Source File @@ -1786,22 +1706,6 @@ SOURCE=..\src\generic\fontdlgg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\grid.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\generic\gridctrl.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\generic\gridsel.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\generic\helpext.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\imaglist.cpp !IF "$(CFG)" == "coredll - Win32 DLL Native Debug Unicode" @@ -1837,10 +1741,6 @@ SOURCE=..\src\generic\imaglist.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\laywin.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\listctrl.cpp !IF "$(CFG)" == "coredll - Win32 DLL Native Debug Unicode" @@ -2001,10 +1901,6 @@ SOURCE=..\src\generic\renderg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\sashwin.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\scrlwing.cpp # End Source File # Begin Source File @@ -2017,10 +1913,6 @@ SOURCE=..\src\generic\spinctlg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\splash.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\splitter.cpp # End Source File # Begin Source File @@ -2103,10 +1995,6 @@ SOURCE=..\src\generic\textdlgg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\tipdlg.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\tipwin.cpp # End Source File # Begin Source File @@ -2121,10 +2009,6 @@ SOURCE=..\src\generic\vlbox.cpp SOURCE=..\src\generic\vscroll.cpp # End Source File -# Begin Source File - -SOURCE=..\src\generic\wizard.cpp -# End Source File # End Group # Begin Group "wxUniv Sources" @@ -3486,10 +3370,6 @@ SOURCE=..\src\common\datacmn.cpp # End Source File # Begin Source File -SOURCE=..\src\common\dbgrid.cpp -# End Source File -# Begin Source File - SOURCE=..\src\common\dcbase.cpp # End Source File # Begin Source File diff --git a/build/wx_corelib.dsp b/build/wx_corelib.dsp index 90c4eb0879..5315b1732c 100644 --- a/build/wx_corelib.dsp +++ b/build/wx_corelib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=corelib - Win32 Static Native Release Unicode +CFG=corelib - Win32 LIB wxUniv Release Ansi !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,18 +13,18 @@ CFG=corelib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_corelib.mak" CFG="corelib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_corelib.mak" CFG="corelib - Win32 LIB wxUniv Release Ansi" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "corelib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -34,7 +34,30 @@ CFG=corelib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\corelib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\corelib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_core.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_core.lib" + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -46,8 +69,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswu\" # PROP Intermediate_Dir "vc_mswu\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -57,30 +80,30 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_core.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\corelib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\corelib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_core.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_core.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_core.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -92,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_msw\" # PROP Intermediate_Dir "vc_msw\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -103,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_core.lib" # ADD LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -115,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswud\" # PROP Intermediate_Dir "vc_mswud\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -126,53 +149,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_core.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" -# PROP BASE Intermediate_Dir "vc_mswunivd\corelib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" -# PROP Intermediate_Dir "vc_mswunivd\corelib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_core.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_core.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_core.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\corelib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\corelib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_core.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_core.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_core.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -184,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswd\" # PROP Intermediate_Dir "vc_mswd\corelib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -195,41 +218,18 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_core.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\corelib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\corelib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_core.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_core.lib" - !ENDIF # Begin Target -# Name "corelib - Win32 Static Native Release Unicode" -# Name "corelib - Win32 Static wxUniv Release Unicode" -# Name "corelib - Win32 Static Native Release Ansi" -# Name "corelib - Win32 Static Native Debug Unicode" -# Name "corelib - Win32 Static wxUniv Debug Ansi" -# Name "corelib - Win32 Static wxUniv Release Ansi" -# Name "corelib - Win32 Static Native Debug Ansi" -# Name "corelib - Win32 Static wxUniv Debug Unicode" +# Name "corelib - Win32 LIB wxUniv Release Ansi" +# Name "corelib - Win32 LIB Native Release Unicode" +# Name "corelib - Win32 LIB wxUniv Debug Ansi" +# Name "corelib - Win32 LIB Native Release Ansi" +# Name "corelib - Win32 LIB Native Debug Unicode" +# Name "corelib - Win32 LIB wxUniv Release Unicode" +# Name "corelib - Win32 LIB wxUniv Debug Unicode" +# Name "corelib - Win32 LIB Native Debug Ansi" # Begin Group "Common Headers" # PROP Default_Filter "" @@ -271,10 +271,6 @@ SOURCE=..\include\wx\button.h # End Source File # Begin Source File -SOURCE=..\include\wx\calctrl.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\caret.h # End Source File # Begin Source File @@ -339,18 +335,10 @@ SOURCE=..\include\wx\dataobj.h # End Source File # Begin Source File -SOURCE=..\include\wx\dbgrid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\dc.h # End Source File # Begin Source File -SOURCE=..\include\wx\dcbuffer.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\dcclient.h # End Source File # Begin Source File @@ -467,10 +455,6 @@ SOURCE=..\include\wx\generic\accel.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\calctrl.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\choicdgg.h # End Source File # Begin Source File @@ -507,30 +491,10 @@ SOURCE=..\include\wx\generic\fontdlgg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\grid.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\gridctrl.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\gridsel.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\helpext.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\laywin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\listctrl.h # End Source File # Begin Source File @@ -563,10 +527,6 @@ SOURCE=..\include\wx\generic\progdlgg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\sashwin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\scrolwin.h # End Source File # Begin Source File @@ -575,10 +535,6 @@ SOURCE=..\include\wx\generic\spinctlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\splash.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\splitter.h # End Source File # Begin Source File @@ -603,10 +559,6 @@ SOURCE=..\include\wx\generic\treectlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\wizard.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\geometry.h # End Source File # Begin Source File @@ -619,10 +571,6 @@ SOURCE=..\include\wx\glcanvas.h # End Source File # Begin Source File -SOURCE=..\include\wx\grid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\help.h # End Source File # Begin Source File @@ -699,10 +647,6 @@ SOURCE=..\include\wx\layout.h # End Source File # Begin Source File -SOURCE=..\include\wx\laywin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\listbase.h # End Source File # Begin Source File @@ -1199,10 +1143,6 @@ SOURCE=..\include\wx\renderer.h # End Source File # Begin Source File -SOURCE=..\include\wx\sashwin.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\scopeguard.h # End Source File # Begin Source File @@ -1239,10 +1179,6 @@ SOURCE=..\include\wx\spinctrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\splash.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\splitter.h # End Source File # Begin Source File @@ -1307,10 +1243,6 @@ SOURCE=..\include\wx\timer.h # End Source File # Begin Source File -SOURCE=..\include\wx\tipdlg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\tipwin.h # End Source File # Begin Source File @@ -1515,10 +1447,6 @@ SOURCE=..\include\wx\window.h # End Source File # Begin Source File -SOURCE=..\include\wx\wizard.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\xpmdecod.h # End Source File # Begin Source File @@ -1533,34 +1461,34 @@ SOURCE=..\include\wx\xpmhand.h SOURCE=..\src\generic\accel.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1570,53 +1498,45 @@ SOURCE=..\src\generic\busyinfo.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\calctrl.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\choicdgg.cpp # End Source File # Begin Source File SOURCE=..\src\generic\colrdlgg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File # Begin Source File -SOURCE=..\src\generic\dcbuffer.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\dcpsg.cpp # End Source File # Begin Source File @@ -1627,34 +1547,34 @@ SOURCE=..\src\generic\dirctrlg.cpp SOURCE=..\src\generic\dirdlgg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1666,34 +1586,34 @@ SOURCE=..\src\generic\dragimgg.cpp SOURCE=..\src\generic\fdrepdlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1701,34 +1621,34 @@ SOURCE=..\src\generic\fdrepdlg.cpp SOURCE=..\src\generic\filedlgg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1736,124 +1656,104 @@ SOURCE=..\src\generic\filedlgg.cpp SOURCE=..\src\generic\fontdlgg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File # Begin Source File -SOURCE=..\src\generic\grid.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\generic\gridctrl.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\generic\gridsel.cpp -# End Source File -# Begin Source File +SOURCE=..\src\generic\imaglist.cpp -SOURCE=..\src\generic\helpext.cpp -# End Source File -# Begin Source File +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" -SOURCE=..\src\generic\imaglist.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File # Begin Source File -SOURCE=..\src\generic\laywin.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\listctrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1865,34 +1765,34 @@ SOURCE=..\src\generic\logg.cpp SOURCE=..\src\generic\mdig.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1900,34 +1800,34 @@ SOURCE=..\src\generic\mdig.cpp SOURCE=..\src\generic\msgdlgg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1943,34 +1843,34 @@ SOURCE=..\src\generic\panelg.cpp SOURCE=..\src\generic\prntdlgg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -1984,10 +1884,6 @@ SOURCE=..\src\generic\renderg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\sashwin.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\scrlwing.cpp # End Source File # Begin Source File @@ -2000,43 +1896,39 @@ SOURCE=..\src\generic\spinctlg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\splash.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\splitter.cpp # End Source File # Begin Source File SOURCE=..\src\generic\statusbr.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" - - -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -2045,34 +1937,34 @@ SOURCE=..\src\generic\statusbr.cpp SOURCE=..\src\generic\tabg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2086,10 +1978,6 @@ SOURCE=..\src\generic\textdlgg.cpp # End Source File # Begin Source File -SOURCE=..\src\generic\tipdlg.cpp -# End Source File -# Begin Source File - SOURCE=..\src\generic\tipwin.cpp # End Source File # Begin Source File @@ -2104,10 +1992,6 @@ SOURCE=..\src\generic\vlbox.cpp SOURCE=..\src\generic\vscroll.cpp # End Source File -# Begin Source File - -SOURCE=..\src\generic\wizard.cpp -# End Source File # End Group # Begin Group "wxUniv Sources" @@ -2116,34 +2000,34 @@ SOURCE=..\src\generic\wizard.cpp SOURCE=..\src\univ\bmpbuttn.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2151,34 +2035,34 @@ SOURCE=..\src\univ\bmpbuttn.cpp SOURCE=..\src\univ\button.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2186,34 +2070,34 @@ SOURCE=..\src\univ\button.cpp SOURCE=..\src\univ\checkbox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2221,34 +2105,34 @@ SOURCE=..\src\univ\checkbox.cpp SOURCE=..\src\univ\checklst.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2256,34 +2140,34 @@ SOURCE=..\src\univ\checklst.cpp SOURCE=..\src\univ\choice.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2291,34 +2175,34 @@ SOURCE=..\src\univ\choice.cpp SOURCE=..\src\univ\colschem.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2326,34 +2210,34 @@ SOURCE=..\src\univ\colschem.cpp SOURCE=..\src\univ\combobox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2361,33 +2245,33 @@ SOURCE=..\src\univ\combobox.cpp SOURCE=..\src\univ\control.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" +# PROP Exclude_From_Build 1 !ENDIF @@ -2396,34 +2280,34 @@ SOURCE=..\src\univ\control.cpp SOURCE=..\src\univ\dialog.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2431,34 +2315,34 @@ SOURCE=..\src\univ\dialog.cpp SOURCE=..\src\univ\framuniv.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2466,34 +2350,34 @@ SOURCE=..\src\univ\framuniv.cpp SOURCE=..\src\univ\gauge.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2501,34 +2385,34 @@ SOURCE=..\src\univ\gauge.cpp SOURCE=..\src\univ\inpcons.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2536,34 +2420,34 @@ SOURCE=..\src\univ\inpcons.cpp SOURCE=..\src\univ\inphand.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2571,34 +2455,34 @@ SOURCE=..\src\univ\inphand.cpp SOURCE=..\src\univ\listbox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2606,34 +2490,34 @@ SOURCE=..\src\univ\listbox.cpp SOURCE=..\src\univ\menu.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2641,34 +2525,34 @@ SOURCE=..\src\univ\menu.cpp SOURCE=..\src\univ\notebook.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2676,34 +2560,34 @@ SOURCE=..\src\univ\notebook.cpp SOURCE=..\src\univ\radiobox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2711,34 +2595,34 @@ SOURCE=..\src\univ\radiobox.cpp SOURCE=..\src\univ\radiobut.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2746,34 +2630,34 @@ SOURCE=..\src\univ\radiobut.cpp SOURCE=..\src\univ\renderer.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2781,34 +2665,34 @@ SOURCE=..\src\univ\renderer.cpp SOURCE=..\src\univ\scrarrow.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2816,34 +2700,34 @@ SOURCE=..\src\univ\scrarrow.cpp SOURCE=..\src\univ\scrolbar.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2851,34 +2735,34 @@ SOURCE=..\src\univ\scrolbar.cpp SOURCE=..\src\univ\scrthumb.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2886,34 +2770,34 @@ SOURCE=..\src\univ\scrthumb.cpp SOURCE=..\src\univ\slider.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2921,34 +2805,34 @@ SOURCE=..\src\univ\slider.cpp SOURCE=..\src\univ\spinbutt.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2956,34 +2840,34 @@ SOURCE=..\src\univ\spinbutt.cpp SOURCE=..\src\univ\statbmp.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -2991,34 +2875,34 @@ SOURCE=..\src\univ\statbmp.cpp SOURCE=..\src\univ\statbox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3026,34 +2910,34 @@ SOURCE=..\src\univ\statbox.cpp SOURCE=..\src\univ\statline.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3061,34 +2945,34 @@ SOURCE=..\src\univ\statline.cpp SOURCE=..\src\univ\stattext.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3096,34 +2980,34 @@ SOURCE=..\src\univ\stattext.cpp SOURCE=..\src\univ\statusbr.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3131,34 +3015,34 @@ SOURCE=..\src\univ\statusbr.cpp SOURCE=..\src\univ\textctrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3166,34 +3050,34 @@ SOURCE=..\src\univ\textctrl.cpp SOURCE=..\src\univ\theme.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3201,34 +3085,34 @@ SOURCE=..\src\univ\theme.cpp SOURCE=..\src\univ\themes\gtk.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3236,34 +3120,34 @@ SOURCE=..\src\univ\themes\gtk.cpp SOURCE=..\src\univ\themes\metal.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3271,34 +3155,34 @@ SOURCE=..\src\univ\themes\metal.cpp SOURCE=..\src\univ\themes\win32.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3306,34 +3190,34 @@ SOURCE=..\src\univ\themes\win32.cpp SOURCE=..\src\univ\toolbar.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3341,34 +3225,34 @@ SOURCE=..\src\univ\toolbar.cpp SOURCE=..\src\univ\topluniv.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3376,34 +3260,34 @@ SOURCE=..\src\univ\topluniv.cpp SOURCE=..\src\univ\winuniv.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - - !ENDIF # End Source File @@ -3469,10 +3353,6 @@ SOURCE=..\src\common\datacmn.cpp # End Source File # Begin Source File -SOURCE=..\src\common\dbgrid.cpp -# End Source File -# Begin Source File - SOURCE=..\src\common\dcbase.cpp # End Source File # Begin Source File @@ -3727,33 +3607,33 @@ SOURCE=..\src\common\xpmdecod.cpp SOURCE=..\src\msw\accel.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -3770,33 +3650,33 @@ SOURCE=..\src\msw\bitmap.cpp SOURCE=..\src\msw\bmpbuttn.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -3809,33 +3689,33 @@ SOURCE=..\src\msw\brush.cpp SOURCE=..\src\msw\button.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -3848,33 +3728,33 @@ SOURCE=..\src\msw\caret.cpp SOURCE=..\src\msw\checkbox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -3883,33 +3763,33 @@ SOURCE=..\src\msw\checkbox.cpp SOURCE=..\src\msw\checklst.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" - +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 !ENDIF @@ -3918,33 +3798,33 @@ SOURCE=..\src\msw\checklst.cpp SOURCE=..\src\msw\choice.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -3957,33 +3837,33 @@ SOURCE=..\src\msw\clipbrd.cpp SOURCE=..\src\msw\colordlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -3996,33 +3876,33 @@ SOURCE=..\src\msw\colour.cpp SOURCE=..\src\msw\combobox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4031,34 +3911,34 @@ SOURCE=..\src\msw\combobox.cpp SOURCE=..\src\msw\control.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 - !ENDIF # End Source File @@ -4094,33 +3974,33 @@ SOURCE=..\src\msw\dcscreen.cpp SOURCE=..\src\msw\dialog.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4145,33 +4025,33 @@ SOURCE=..\src\msw\display.cpp SOURCE=..\src\msw\dragimag.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4194,33 +4074,33 @@ SOURCE=..\src\msw\evtloop.cpp SOURCE=..\src\msw\fdrepdlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4229,33 +4109,33 @@ SOURCE=..\src\msw\fdrepdlg.cpp SOURCE=..\src\msw\filedlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4268,33 +4148,33 @@ SOURCE=..\src\msw\font.cpp SOURCE=..\src\msw\fontdlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4311,33 +4191,33 @@ SOURCE=..\src\msw\fontutil.cpp SOURCE=..\src\msw\frame.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4346,33 +4226,33 @@ SOURCE=..\src\msw\frame.cpp SOURCE=..\src\msw\gauge95.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4401,33 +4281,33 @@ SOURCE=..\src\msw\icon.cpp SOURCE=..\src\msw\imaglist.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4436,33 +4316,33 @@ SOURCE=..\src\msw\imaglist.cpp SOURCE=..\src\msw\iniconf.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4475,33 +4355,33 @@ SOURCE=..\src\msw\joystick.cpp SOURCE=..\src\msw\listbox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4510,34 +4390,34 @@ SOURCE=..\src\msw\listbox.cpp SOURCE=..\src\msw\listctrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" + + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 - !ENDIF # End Source File @@ -4549,33 +4429,33 @@ SOURCE=..\src\msw\main.cpp SOURCE=..\src\msw\mdi.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4584,33 +4464,33 @@ SOURCE=..\src\msw\mdi.cpp SOURCE=..\src\msw\menu.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4619,33 +4499,33 @@ SOURCE=..\src\msw\menu.cpp SOURCE=..\src\msw\menuitem.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4654,33 +4534,33 @@ SOURCE=..\src\msw\menuitem.cpp SOURCE=..\src\msw\metafile.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4693,33 +4573,33 @@ SOURCE=..\src\msw\minifram.cpp SOURCE=..\src\msw\msgdlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4732,33 +4612,33 @@ SOURCE=..\src\msw\mslu.cpp SOURCE=..\src\msw\nativdlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" - +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 !ENDIF @@ -4767,33 +4647,33 @@ SOURCE=..\src\msw\nativdlg.cpp SOURCE=..\src\msw\notebook.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4802,33 +4682,33 @@ SOURCE=..\src\msw\notebook.cpp SOURCE=..\src\msw\ole\access.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4861,33 +4741,33 @@ SOURCE=..\src\msw\ole\uuid.cpp SOURCE=..\src\msw\ownerdrw.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4904,33 +4784,33 @@ SOURCE=..\src\msw\pen.cpp SOURCE=..\src\msw\penwin.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -4943,34 +4823,34 @@ SOURCE=..\src\msw\popupwin.cpp SOURCE=..\src\msw\printdlg.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 - !ENDIF # End Source File @@ -4978,33 +4858,33 @@ SOURCE=..\src\msw\printdlg.cpp SOURCE=..\src\msw\printwin.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5013,33 +4893,33 @@ SOURCE=..\src\msw\printwin.cpp SOURCE=..\src\msw\radiobox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5048,33 +4928,33 @@ SOURCE=..\src\msw\radiobox.cpp SOURCE=..\src\msw\radiobut.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5087,33 +4967,33 @@ SOURCE=..\src\msw\region.cpp SOURCE=..\src\msw\renderer.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5122,33 +5002,33 @@ SOURCE=..\src\msw\renderer.cpp SOURCE=..\src\msw\scrolbar.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" - +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 !ENDIF @@ -5161,33 +5041,33 @@ SOURCE=..\src\msw\settings.cpp SOURCE=..\src\msw\slider95.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" - +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 !ENDIF @@ -5196,33 +5076,33 @@ SOURCE=..\src\msw\slider95.cpp SOURCE=..\src\msw\spinbutt.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5231,33 +5111,33 @@ SOURCE=..\src\msw\spinbutt.cpp SOURCE=..\src\msw\spinctrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5266,33 +5146,33 @@ SOURCE=..\src\msw\spinctrl.cpp SOURCE=..\src\msw\statbmp.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5301,33 +5181,33 @@ SOURCE=..\src\msw\statbmp.cpp SOURCE=..\src\msw\statbox.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5336,34 +5216,34 @@ SOURCE=..\src\msw\statbox.cpp SOURCE=..\src\msw\statbr95.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 - !ENDIF # End Source File @@ -5371,33 +5251,33 @@ SOURCE=..\src\msw\statbr95.cpp SOURCE=..\src\msw\statline.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5406,33 +5286,33 @@ SOURCE=..\src\msw\statline.cpp SOURCE=..\src\msw\stattext.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5441,33 +5321,33 @@ SOURCE=..\src\msw\stattext.cpp SOURCE=..\src\msw\tabctrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5480,33 +5360,33 @@ SOURCE=..\src\msw\taskbar.cpp SOURCE=..\src\msw\tbar95.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5515,33 +5395,33 @@ SOURCE=..\src\msw\tbar95.cpp SOURCE=..\src\msw\textctrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" + +# PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" + +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" - +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" - -# PROP Exclude_From_Build 1 !ENDIF @@ -5550,33 +5430,33 @@ SOURCE=..\src\msw\textctrl.cpp SOURCE=..\src\msw\tglbtn.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5597,33 +5477,33 @@ SOURCE=..\src\msw\toplevel.cpp SOURCE=..\src\msw\treectrl.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF @@ -5636,33 +5516,33 @@ SOURCE=..\src\msw\utilsgui.cpp SOURCE=..\src\msw\uxtheme.cpp -!IF "$(CFG)" == "corelib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Ansi" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Release Ansi" -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Unicode" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Release Unicode" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB wxUniv Debug Unicode" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "corelib - Win32 LIB Native Debug Ansi" -# PROP Exclude_From_Build 1 !ENDIF diff --git a/build/wx_gldll.dsp b/build/wx_gldll.dsp index edca5a0915..9e39cc614e 100644 --- a/build/wx_gldll.dsp +++ b/build/wx_gldll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswuddll\" # PROP Intermediate_Dir "vc_mswuddll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -72,8 +72,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivudll\" # PROP Intermediate_Dir "vc_mswunivudll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -172,8 +172,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL @@ -222,8 +222,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\gldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL diff --git a/build/wx_gllib.dsp b/build/wx_gllib.dsp index 1fa015d287..793376a34e 100644 --- a/build/wx_gllib.dsp +++ b/build/wx_gllib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=gllib - Win32 Static Native Release Unicode +CFG=gllib - Win32 LIB wxUniv Release Ansi !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,18 +13,18 @@ CFG=gllib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_gllib.mak" CFG="gllib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_gllib.mak" CFG="gllib - Win32 LIB wxUniv Release Ansi" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "gllib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "gllib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "gllib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -34,7 +34,30 @@ CFG=gllib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "gllib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "gllib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\gllib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\gllib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_gl.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_gl.lib" + +!ELSEIF "$(CFG)" == "gllib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -46,8 +69,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswu\" # PROP Intermediate_Dir "vc_mswu\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -57,30 +80,30 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_gl.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "gllib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\gllib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\gllib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_gl.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_gl.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_gl.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "gllib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -92,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_msw\" # PROP Intermediate_Dir "vc_msw\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -103,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_gl.lib" # ADD LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "gllib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -115,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswud\" # PROP Intermediate_Dir "vc_mswud\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -126,53 +149,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_gl.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "gllib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" -# PROP BASE Intermediate_Dir "vc_mswunivd\gllib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" -# PROP Intermediate_Dir "vc_mswunivd\gllib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_gl.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_gl.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_gl.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "gllib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\gllib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\gllib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_gl.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_gl.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_gl.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "gllib - Win32 LIB Native Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -184,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswd\" # PROP Intermediate_Dir "vc_mswd\gllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -195,41 +218,18 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_gl.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_gl.lib" -!ELSEIF "$(CFG)" == "gllib - Win32 Static wxUniv Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\gllib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\gllib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_gl.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_gl.lib" - !ENDIF # Begin Target -# Name "gllib - Win32 Static Native Release Unicode" -# Name "gllib - Win32 Static wxUniv Release Unicode" -# Name "gllib - Win32 Static Native Release Ansi" -# Name "gllib - Win32 Static Native Debug Unicode" -# Name "gllib - Win32 Static wxUniv Debug Ansi" -# Name "gllib - Win32 Static wxUniv Release Ansi" -# Name "gllib - Win32 Static Native Debug Ansi" -# Name "gllib - Win32 Static wxUniv Debug Unicode" +# Name "gllib - Win32 LIB wxUniv Release Ansi" +# Name "gllib - Win32 LIB Native Release Unicode" +# Name "gllib - Win32 LIB wxUniv Debug Ansi" +# Name "gllib - Win32 LIB Native Release Ansi" +# Name "gllib - Win32 LIB Native Debug Unicode" +# Name "gllib - Win32 LIB wxUniv Release Unicode" +# Name "gllib - Win32 LIB wxUniv Debug Unicode" +# Name "gllib - Win32 LIB Native Debug Ansi" # Begin Group "Common Headers" # PROP Default_Filter "" diff --git a/build/wx_htmldll.dsp b/build/wx_htmldll.dsp index 5c7f48aced..a8089a64a0 100644 --- a/build/wx_htmldll.dsp +++ b/build/wx_htmldll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswuddll\" # PROP Intermediate_Dir "vc_mswuddll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -72,8 +72,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivudll\" # PROP Intermediate_Dir "vc_mswunivudll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -172,8 +172,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML @@ -222,8 +222,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\htmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML diff --git a/build/wx_htmllib.dsp b/build/wx_htmllib.dsp index fdff0bcbf0..4e9d1146a8 100644 --- a/build/wx_htmllib.dsp +++ b/build/wx_htmllib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=htmllib - Win32 Static Native Release Unicode +CFG=htmllib - Win32 LIB wxUniv Release Ansi !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,18 +13,18 @@ CFG=htmllib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_htmllib.mak" CFG="htmllib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_htmllib.mak" CFG="htmllib - Win32 LIB wxUniv Release Ansi" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "htmllib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "htmllib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "htmllib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -34,7 +34,30 @@ CFG=htmllib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "htmllib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "htmllib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\htmllib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\htmllib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_html.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_html.lib" + +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -46,8 +69,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswu\" # PROP Intermediate_Dir "vc_mswu\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -57,30 +80,30 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_html.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\htmllib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\htmllib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_html.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_html.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_html.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -92,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_msw\" # PROP Intermediate_Dir "vc_msw\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -103,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_html.lib" # ADD LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -115,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswud\" # PROP Intermediate_Dir "vc_mswud\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -126,53 +149,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_html.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" -# PROP BASE Intermediate_Dir "vc_mswunivd\htmllib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" -# PROP Intermediate_Dir "vc_mswunivd\htmllib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_html.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_html.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_html.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\htmllib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\htmllib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_html.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_html.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_html.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "htmllib - Win32 LIB Native Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -184,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswd\" # PROP Intermediate_Dir "vc_mswd\htmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -195,41 +218,18 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_html.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_html.lib" -!ELSEIF "$(CFG)" == "htmllib - Win32 Static wxUniv Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\htmllib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\htmllib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_html.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_html.lib" - !ENDIF # Begin Target -# Name "htmllib - Win32 Static Native Release Unicode" -# Name "htmllib - Win32 Static wxUniv Release Unicode" -# Name "htmllib - Win32 Static Native Release Ansi" -# Name "htmllib - Win32 Static Native Debug Unicode" -# Name "htmllib - Win32 Static wxUniv Debug Ansi" -# Name "htmllib - Win32 Static wxUniv Release Ansi" -# Name "htmllib - Win32 Static Native Debug Ansi" -# Name "htmllib - Win32 Static wxUniv Debug Unicode" +# Name "htmllib - Win32 LIB wxUniv Release Ansi" +# Name "htmllib - Win32 LIB Native Release Unicode" +# Name "htmllib - Win32 LIB wxUniv Debug Ansi" +# Name "htmllib - Win32 LIB Native Release Ansi" +# Name "htmllib - Win32 LIB Native Debug Unicode" +# Name "htmllib - Win32 LIB wxUniv Release Unicode" +# Name "htmllib - Win32 LIB wxUniv Debug Unicode" +# Name "htmllib - Win32 LIB Native Debug Ansi" # Begin Group "Common Headers" # PROP Default_Filter "" diff --git a/build/wx_netdll.dsp b/build/wx_netdll.dsp index cb07c081d4..cf3a2298c4 100644 --- a/build/wx_netdll.dsp +++ b/build/wx_netdll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswuddll\" # PROP Intermediate_Dir "vc_mswuddll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -72,8 +72,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivudll\" # PROP Intermediate_Dir "vc_mswunivudll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -172,8 +172,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET @@ -222,8 +222,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\netdll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET diff --git a/build/wx_netlib.dsp b/build/wx_netlib.dsp index 307cde7d9e..a3d88f9e51 100644 --- a/build/wx_netlib.dsp +++ b/build/wx_netlib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=netlib - Win32 Static Native Release Unicode +CFG=netlib - Win32 LIB wxUniv Release Ansi !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,18 +13,18 @@ CFG=netlib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_netlib.mak" CFG="netlib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_netlib.mak" CFG="netlib - Win32 LIB wxUniv Release Ansi" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "netlib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "netlib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netlib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -34,7 +34,30 @@ CFG=netlib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "netlib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "netlib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\netlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\netlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_net.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_net.lib" + +!ELSEIF "$(CFG)" == "netlib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -46,8 +69,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswu\" # PROP Intermediate_Dir "vc_mswu\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -57,30 +80,30 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u_net.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "netlib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\netlib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\netlib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_net.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_net.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_net.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "netlib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -92,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_msw\" # PROP Intermediate_Dir "vc_msw\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -103,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxbase25_net.lib" # ADD LIB32 /nologo /out:"..\lib\vc_msw\wxbase25_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "netlib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -115,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswud\" # PROP Intermediate_Dir "vc_mswud\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -126,53 +149,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud_net.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "netlib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" -# PROP BASE Intermediate_Dir "vc_mswunivd\netlib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" -# PROP Intermediate_Dir "vc_mswunivd\netlib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_net.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_net.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_net.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "netlib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\netlib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\netlib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_net.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_net.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_net.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "netlib - Win32 LIB Native Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -184,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswd\" # PROP Intermediate_Dir "vc_mswd\netlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -195,41 +218,18 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d_net.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d_net.lib" -!ELSEIF "$(CFG)" == "netlib - Win32 Static wxUniv Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\netlib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\netlib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_net.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_net.lib" - !ENDIF # Begin Target -# Name "netlib - Win32 Static Native Release Unicode" -# Name "netlib - Win32 Static wxUniv Release Unicode" -# Name "netlib - Win32 Static Native Release Ansi" -# Name "netlib - Win32 Static Native Debug Unicode" -# Name "netlib - Win32 Static wxUniv Debug Ansi" -# Name "netlib - Win32 Static wxUniv Release Ansi" -# Name "netlib - Win32 Static Native Debug Ansi" -# Name "netlib - Win32 Static wxUniv Debug Unicode" +# Name "netlib - Win32 LIB wxUniv Release Ansi" +# Name "netlib - Win32 LIB Native Release Unicode" +# Name "netlib - Win32 LIB wxUniv Debug Ansi" +# Name "netlib - Win32 LIB Native Release Ansi" +# Name "netlib - Win32 LIB Native Debug Unicode" +# Name "netlib - Win32 LIB wxUniv Release Unicode" +# Name "netlib - Win32 LIB wxUniv Debug Unicode" +# Name "netlib - Win32 LIB Native Debug Ansi" # Begin Group "Common Headers" # PROP Default_Filter "" diff --git a/build/wx_wxexpat.dsp b/build/wx_wxexpat.dsp index 2b663f4e1d..1348e96603 100644 --- a/build/wx_wxexpat.dsp +++ b/build/wx_wxexpat.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=wxexpat - Win32 Static Native Release Unicode +CFG=wxexpat - Win32 LIB wxUniv Debug Unicode !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=wxexpat - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 LIB wxUniv Debug Unicode" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxexpat - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxexpat - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxexpat - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxexpat - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxexpat - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxexpat - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxexpat - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxexpat - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxexpat - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,28 +42,28 @@ CFG=wxexpat - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxexpat - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "wxexpat - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" -# PROP BASE Intermediate_Dir "vc_mswu\wxexpat" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" -# PROP Intermediate_Dir "vc_mswu\wxexpat" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxexpat.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxexpat.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxexpatd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxexpatd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxexpat.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxexpat.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxexpatd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxexpatd.lib" !ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Native Release Ansi" @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxexpat.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxexpat.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxexpat.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxexpat.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxexpatd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxexpatd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxexpatd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxexpatd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -111,28 +111,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxexpatd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxexpatd.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxexpat" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" -# PROP Intermediate_Dir "vc_mswuddll\wxexpat" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxexpatd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxexpatd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxexpat.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxexpat.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxexpatd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxexpatd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxexpat.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxexpat.lib" !ELSEIF "$(CFG)" == "wxexpat - Win32 DLL wxUniv Release Ansi" @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxexpat.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxexpat.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxexpat.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxexpat.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -157,28 +157,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxexpat.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxexpat.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" -# PROP BASE Intermediate_Dir "vc_msw\wxexpat" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" -# PROP Intermediate_Dir "vc_msw\wxexpat" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxexpat.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxexpat.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxexpatd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxexpatd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxexpat.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxexpat.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxexpatd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxexpatd.lib" !ELSEIF "$(CFG)" == "wxexpat - Win32 DLL wxUniv Debug Ansi" @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxexpatd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxexpatd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxexpatd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxexpatd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -203,6 +203,29 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxexpatd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxexpatd.lib" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\wxexpat" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\wxexpat" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxexpatd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxexpatd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxexpatd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxexpatd.lib" + !ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Native Release Unicode" # PROP BASE Use_MFC 0 @@ -215,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxexpat.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxexpat.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxexpat.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxexpat.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -226,53 +249,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxexpat.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxexpat.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB wxUniv Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat" +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\wxexpat" +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxexpat.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxexpat.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxexpat.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxexpat.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxexpat.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxexpat.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxexpat.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxexpat.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat" +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" -# PROP Intermediate_Dir "vc_mswunivudll\wxexpat" +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxexpat.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxexpat.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxexpat.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxexpat.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxexpat.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxexpat.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxexpat.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxexpat.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -284,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivd\" # PROP Intermediate_Dir "vc_mswunivd\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxexpatd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxexpatd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxexpatd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxexpatd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -295,51 +318,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxexpatd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxexpatd.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" -# PROP BASE Intermediate_Dir "vc_mswud\wxexpat" +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" -# PROP Intermediate_Dir "vc_mswud\wxexpat" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxexpatd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxexpatd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxexpatd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxexpatd.lib" - -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static wxUniv Release Ansi" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\wxexpat" +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxexpat.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxexpat.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxexpatd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxexpatd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxexpat.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxexpat.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxexpatd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxexpatd.lib" !ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Native Debug Ansi" @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxexpatd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxexpatd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxexpatd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxexpatd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -364,72 +364,72 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxexpatd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxexpatd.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxexpat" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\wxexpat" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxexpatd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxexpatd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxexpat.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxexpat.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxexpatd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxexpatd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxexpat.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxexpat.lib" -!ELSEIF "$(CFG)" == "wxexpat - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "wxexpat - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" -# PROP BASE Intermediate_Dir "vc_mswd\wxexpat" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" -# PROP Intermediate_Dir "vc_mswd\wxexpat" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\wxexpat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxexpatd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxexpatd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxexpat.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxexpat.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxexpatd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxexpatd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxexpat.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxexpat.lib" !ENDIF # Begin Target -# Name "wxexpat - Win32 Static Native Release Unicode" +# Name "wxexpat - Win32 LIB wxUniv Debug Unicode" # Name "wxexpat - Win32 DLL Native Release Ansi" # Name "wxexpat - Win32 DLL wxUniv Debug Unicode" -# Name "wxexpat - Win32 DLL Native Debug Unicode" +# Name "wxexpat - Win32 DLL wxUniv Release Unicode" # Name "wxexpat - Win32 DLL wxUniv Release Ansi" -# Name "wxexpat - Win32 Static Native Release Ansi" +# Name "wxexpat - Win32 LIB Native Debug Unicode" # Name "wxexpat - Win32 DLL wxUniv Debug Ansi" +# Name "wxexpat - Win32 LIB Native Debug Ansi" # Name "wxexpat - Win32 DLL Native Release Unicode" -# Name "wxexpat - Win32 Static wxUniv Release Unicode" -# Name "wxexpat - Win32 DLL wxUniv Release Unicode" -# Name "wxexpat - Win32 Static wxUniv Debug Ansi" -# Name "wxexpat - Win32 Static Native Debug Unicode" -# Name "wxexpat - Win32 Static wxUniv Release Ansi" +# Name "wxexpat - Win32 LIB wxUniv Release Ansi" +# Name "wxexpat - Win32 LIB Native Release Unicode" +# Name "wxexpat - Win32 LIB wxUniv Debug Ansi" +# Name "wxexpat - Win32 DLL Native Debug Unicode" # Name "wxexpat - Win32 DLL Native Debug Ansi" -# Name "wxexpat - Win32 Static wxUniv Debug Unicode" -# Name "wxexpat - Win32 Static Native Debug Ansi" +# Name "wxexpat - Win32 LIB Native Release Ansi" +# Name "wxexpat - Win32 LIB wxUniv Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/build/wx_wxjpeg.dsp b/build/wx_wxjpeg.dsp index bbc373643f..43160d92cc 100644 --- a/build/wx_wxjpeg.dsp +++ b/build/wx_wxjpeg.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=wxjpeg - Win32 Static Native Release Unicode +CFG=wxjpeg - Win32 LIB wxUniv Debug Unicode !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=wxjpeg - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 LIB wxUniv Debug Unicode" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxjpeg - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxjpeg - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxjpeg - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxjpeg - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxjpeg - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxjpeg - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxjpeg - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxjpeg - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxjpeg - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,28 +42,28 @@ CFG=wxjpeg - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxjpeg - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" -# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" -# PROP Intermediate_Dir "vc_mswu\wxjpeg" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib" !ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Native Release Ansi" @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -111,28 +111,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxjpegd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxjpegd.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxjpeg" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" -# PROP Intermediate_Dir "vc_mswuddll\wxjpeg" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib" !ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Release Ansi" @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -157,28 +157,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxjpeg.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxjpeg.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" -# PROP BASE Intermediate_Dir "vc_msw\wxjpeg" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" -# PROP Intermediate_Dir "vc_msw\wxjpeg" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib" !ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Debug Ansi" @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -203,6 +203,29 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxjpegd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxjpegd.lib" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\wxjpeg" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib" + !ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Native Release Unicode" # PROP BASE Use_MFC 0 @@ -215,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -226,53 +249,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxjpeg.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxjpeg.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg" +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\wxjpeg" +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg" +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" -# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg" +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -284,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivd\" # PROP Intermediate_Dir "vc_mswunivd\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -295,51 +318,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxjpegd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxjpegd.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" -# PROP BASE Intermediate_Dir "vc_mswud\wxjpeg" +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" -# PROP Intermediate_Dir "vc_mswud\wxjpeg" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib" - -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static wxUniv Release Ansi" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\wxjpeg" +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib" !ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Native Debug Ansi" @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -364,72 +364,72 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxjpegd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxjpegd.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\wxjpeg" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib" -!ELSEIF "$(CFG)" == "wxjpeg - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" -# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" -# PROP Intermediate_Dir "vc_mswd\wxjpeg" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\wxjpeg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib" !ENDIF # Begin Target -# Name "wxjpeg - Win32 Static Native Release Unicode" +# Name "wxjpeg - Win32 LIB wxUniv Debug Unicode" # Name "wxjpeg - Win32 DLL Native Release Ansi" # Name "wxjpeg - Win32 DLL wxUniv Debug Unicode" -# Name "wxjpeg - Win32 DLL Native Debug Unicode" +# Name "wxjpeg - Win32 DLL wxUniv Release Unicode" # Name "wxjpeg - Win32 DLL wxUniv Release Ansi" -# Name "wxjpeg - Win32 Static Native Release Ansi" +# Name "wxjpeg - Win32 LIB Native Debug Unicode" # Name "wxjpeg - Win32 DLL wxUniv Debug Ansi" +# Name "wxjpeg - Win32 LIB Native Debug Ansi" # Name "wxjpeg - Win32 DLL Native Release Unicode" -# Name "wxjpeg - Win32 Static wxUniv Release Unicode" -# Name "wxjpeg - Win32 DLL wxUniv Release Unicode" -# Name "wxjpeg - Win32 Static wxUniv Debug Ansi" -# Name "wxjpeg - Win32 Static Native Debug Unicode" -# Name "wxjpeg - Win32 Static wxUniv Release Ansi" +# Name "wxjpeg - Win32 LIB wxUniv Release Ansi" +# Name "wxjpeg - Win32 LIB Native Release Unicode" +# Name "wxjpeg - Win32 LIB wxUniv Debug Ansi" +# Name "wxjpeg - Win32 DLL Native Debug Unicode" # Name "wxjpeg - Win32 DLL Native Debug Ansi" -# Name "wxjpeg - Win32 Static wxUniv Debug Unicode" -# Name "wxjpeg - Win32 Static Native Debug Ansi" +# Name "wxjpeg - Win32 LIB Native Release Ansi" +# Name "wxjpeg - Win32 LIB wxUniv Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/build/wx_wxpng.dsp b/build/wx_wxpng.dsp index 7dee028207..24d68b68c1 100644 --- a/build/wx_wxpng.dsp +++ b/build/wx_wxpng.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=wxpng - Win32 Static Native Release Unicode +CFG=wxpng - Win32 LIB wxUniv Debug Unicode !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=wxpng - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_wxpng.mak" CFG="wxpng - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_wxpng.mak" CFG="wxpng - Win32 LIB wxUniv Debug Unicode" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxpng - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxpng - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxpng - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxpng - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxpng - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxpng - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxpng - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxpng - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxpng - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,28 +42,28 @@ CFG=wxpng - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxpng - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "wxpng - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" -# PROP BASE Intermediate_Dir "vc_mswu\wxpng" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" -# PROP Intermediate_Dir "vc_mswu\wxpng" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxpng.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxpng.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxpngd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxpngd.lib" !ELSEIF "$(CFG)" == "wxpng - Win32 DLL Native Release Ansi" @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -111,28 +111,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxpngd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxpngd.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxpng - Win32 DLL wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxpng" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" -# PROP Intermediate_Dir "vc_mswuddll\wxpng" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxpngd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxpngd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxpng.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxpng.lib" !ELSEIF "$(CFG)" == "wxpng - Win32 DLL wxUniv Release Ansi" @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -157,28 +157,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxpng.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxpng.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" -# PROP BASE Intermediate_Dir "vc_msw\wxpng" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" -# PROP Intermediate_Dir "vc_msw\wxpng" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxpng.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxpng.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxpngd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxpngd.lib" !ELSEIF "$(CFG)" == "wxpng - Win32 DLL wxUniv Debug Ansi" @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -203,6 +203,29 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxpngd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxpngd.lib" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\wxpng" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\wxpng" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxpngd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxpngd.lib" + !ELSEIF "$(CFG)" == "wxpng - Win32 DLL Native Release Unicode" # PROP BASE Use_MFC 0 @@ -215,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -226,53 +249,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxpng.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxpng.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB wxUniv Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxpng" +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\wxpng" +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxpng.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxpng.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxpng.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxpng.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 DLL wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxpng" +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" -# PROP Intermediate_Dir "vc_mswunivudll\wxpng" +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxpng.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxpng.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxpng.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxpng.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -284,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivd\" # PROP Intermediate_Dir "vc_mswunivd\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -295,51 +318,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxpngd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxpngd.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" -# PROP BASE Intermediate_Dir "vc_mswud\wxpng" +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" -# PROP Intermediate_Dir "vc_mswud\wxpng" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxpngd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxpngd.lib" - -!ELSEIF "$(CFG)" == "wxpng - Win32 Static wxUniv Release Ansi" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxpng" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\wxpng" +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxpng.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxpng.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxpngd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxpngd.lib" !ELSEIF "$(CFG)" == "wxpng - Win32 DLL Native Debug Ansi" @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -364,72 +364,72 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxpngd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxpngd.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxpng" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\wxpng" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxpngd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxpngd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxpng.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxpng.lib" -!ELSEIF "$(CFG)" == "wxpng - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "wxpng - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" -# PROP BASE Intermediate_Dir "vc_mswd\wxpng" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" -# PROP Intermediate_Dir "vc_mswd\wxpng" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\wxpng" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxpngd.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxpngd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxpngd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxpng.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxpng.lib" !ENDIF # Begin Target -# Name "wxpng - Win32 Static Native Release Unicode" +# Name "wxpng - Win32 LIB wxUniv Debug Unicode" # Name "wxpng - Win32 DLL Native Release Ansi" # Name "wxpng - Win32 DLL wxUniv Debug Unicode" -# Name "wxpng - Win32 DLL Native Debug Unicode" +# Name "wxpng - Win32 DLL wxUniv Release Unicode" # Name "wxpng - Win32 DLL wxUniv Release Ansi" -# Name "wxpng - Win32 Static Native Release Ansi" +# Name "wxpng - Win32 LIB Native Debug Unicode" # Name "wxpng - Win32 DLL wxUniv Debug Ansi" +# Name "wxpng - Win32 LIB Native Debug Ansi" # Name "wxpng - Win32 DLL Native Release Unicode" -# Name "wxpng - Win32 Static wxUniv Release Unicode" -# Name "wxpng - Win32 DLL wxUniv Release Unicode" -# Name "wxpng - Win32 Static wxUniv Debug Ansi" -# Name "wxpng - Win32 Static Native Debug Unicode" -# Name "wxpng - Win32 Static wxUniv Release Ansi" +# Name "wxpng - Win32 LIB wxUniv Release Ansi" +# Name "wxpng - Win32 LIB Native Release Unicode" +# Name "wxpng - Win32 LIB wxUniv Debug Ansi" +# Name "wxpng - Win32 DLL Native Debug Unicode" # Name "wxpng - Win32 DLL Native Debug Ansi" -# Name "wxpng - Win32 Static wxUniv Debug Unicode" -# Name "wxpng - Win32 Static Native Debug Ansi" +# Name "wxpng - Win32 LIB Native Release Ansi" +# Name "wxpng - Win32 LIB wxUniv Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/build/wx_wxregex.dsp b/build/wx_wxregex.dsp index 330ed13be3..e18bfb2751 100644 --- a/build/wx_wxregex.dsp +++ b/build/wx_wxregex.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=wxregex - Win32 Static Native Release Unicode +CFG=wxregex - Win32 LIB wxUniv Debug Unicode !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=wxregex - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 LIB wxUniv Debug Unicode" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxregex - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxregex - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxregex - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxregex - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxregex - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxregex - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxregex - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxregex - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxregex - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,28 +42,28 @@ CFG=wxregex - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxregex - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "wxregex - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" -# PROP BASE Intermediate_Dir "vc_mswu\wxregex" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" -# PROP Intermediate_Dir "vc_mswu\wxregex" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxregex.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxregex.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxregexd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxregexd.lib" !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Native Release Ansi" @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -111,28 +111,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxregexd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxregexd.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxregex" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" -# PROP Intermediate_Dir "vc_mswuddll\wxregex" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxregexd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxregexd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxregex.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxregex.lib" !ELSEIF "$(CFG)" == "wxregex - Win32 DLL wxUniv Release Ansi" @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -157,28 +157,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxregex.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxregex.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" -# PROP BASE Intermediate_Dir "vc_msw\wxregex" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" -# PROP Intermediate_Dir "vc_msw\wxregex" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxregex.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxregex.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxregexd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxregexd.lib" !ELSEIF "$(CFG)" == "wxregex - Win32 DLL wxUniv Debug Ansi" @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -203,6 +203,29 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxregexd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxregexd.lib" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\wxregex" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\wxregex" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxregexd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxregexd.lib" + !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Native Release Unicode" # PROP BASE Use_MFC 0 @@ -215,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -226,53 +249,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxregex.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxregex.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB wxUniv Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxregex" +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\wxregex" +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxregex.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxregex.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxregex.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxregex.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 DLL wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxregex" +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" -# PROP Intermediate_Dir "vc_mswunivudll\wxregex" +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxregex.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxregex.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxregex.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxregex.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -284,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivd\" # PROP Intermediate_Dir "vc_mswunivd\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -295,51 +318,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxregexd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxregexd.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" -# PROP BASE Intermediate_Dir "vc_mswud\wxregex" +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" -# PROP Intermediate_Dir "vc_mswud\wxregex" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxregexd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxregexd.lib" - -!ELSEIF "$(CFG)" == "wxregex - Win32 Static wxUniv Release Ansi" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxregex" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\wxregex" +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxregex.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxregex.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxregexd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxregexd.lib" !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Native Debug Ansi" @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -364,72 +364,72 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxregexd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxregexd.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxregex" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\wxregex" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxregexd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxregexd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxregex.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxregex.lib" -!ELSEIF "$(CFG)" == "wxregex - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "wxregex - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" -# PROP BASE Intermediate_Dir "vc_mswd\wxregex" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" -# PROP Intermediate_Dir "vc_mswd\wxregex" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxregexd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxregexd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxregex.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxregex.lib" !ENDIF # Begin Target -# Name "wxregex - Win32 Static Native Release Unicode" +# Name "wxregex - Win32 LIB wxUniv Debug Unicode" # Name "wxregex - Win32 DLL Native Release Ansi" # Name "wxregex - Win32 DLL wxUniv Debug Unicode" -# Name "wxregex - Win32 DLL Native Debug Unicode" +# Name "wxregex - Win32 DLL wxUniv Release Unicode" # Name "wxregex - Win32 DLL wxUniv Release Ansi" -# Name "wxregex - Win32 Static Native Release Ansi" +# Name "wxregex - Win32 LIB Native Debug Unicode" # Name "wxregex - Win32 DLL wxUniv Debug Ansi" +# Name "wxregex - Win32 LIB Native Debug Ansi" # Name "wxregex - Win32 DLL Native Release Unicode" -# Name "wxregex - Win32 Static wxUniv Release Unicode" -# Name "wxregex - Win32 DLL wxUniv Release Unicode" -# Name "wxregex - Win32 Static wxUniv Debug Ansi" -# Name "wxregex - Win32 Static Native Debug Unicode" -# Name "wxregex - Win32 Static wxUniv Release Ansi" +# Name "wxregex - Win32 LIB wxUniv Release Ansi" +# Name "wxregex - Win32 LIB Native Release Unicode" +# Name "wxregex - Win32 LIB wxUniv Debug Ansi" +# Name "wxregex - Win32 DLL Native Debug Unicode" # Name "wxregex - Win32 DLL Native Debug Ansi" -# Name "wxregex - Win32 Static wxUniv Debug Unicode" -# Name "wxregex - Win32 Static Native Debug Ansi" +# Name "wxregex - Win32 LIB Native Release Ansi" +# Name "wxregex - Win32 LIB wxUniv Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/build/wx_wxtiff.dsp b/build/wx_wxtiff.dsp index 75ded72637..2b48d4a11d 100644 --- a/build/wx_wxtiff.dsp +++ b/build/wx_wxtiff.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=wxtiff - Win32 Static Native Release Unicode +CFG=wxtiff - Win32 LIB wxUniv Debug Unicode !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=wxtiff - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_wxtiff.mak" CFG="wxtiff - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_wxtiff.mak" CFG="wxtiff - Win32 LIB wxUniv Debug Unicode" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxtiff - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxtiff - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxtiff - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxtiff - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxtiff - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxtiff - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxtiff - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxtiff - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxtiff - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,28 +42,28 @@ CFG=wxtiff - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxtiff - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "wxtiff - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" -# PROP BASE Intermediate_Dir "vc_mswu\wxtiff" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" -# PROP Intermediate_Dir "vc_mswu\wxtiff" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxtiff.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxtiff.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxtiffd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxtiffd.lib" !ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Native Release Ansi" @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -111,28 +111,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxtiffd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxtiffd.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxtiff" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" -# PROP Intermediate_Dir "vc_mswuddll\wxtiff" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxtiffd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxtiffd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxtiff.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxtiff.lib" !ELSEIF "$(CFG)" == "wxtiff - Win32 DLL wxUniv Release Ansi" @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -157,28 +157,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxtiff.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxtiff.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" -# PROP BASE Intermediate_Dir "vc_msw\wxtiff" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" -# PROP Intermediate_Dir "vc_msw\wxtiff" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxtiff.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxtiff.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxtiffd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxtiffd.lib" !ELSEIF "$(CFG)" == "wxtiff - Win32 DLL wxUniv Debug Ansi" @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -203,6 +203,29 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxtiffd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxtiffd.lib" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\wxtiff" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\wxtiff" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxtiffd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxtiffd.lib" + !ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Native Release Unicode" # PROP BASE Use_MFC 0 @@ -215,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -226,53 +249,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxtiff.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxtiff.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB wxUniv Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxtiff" +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\wxtiff" +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxtiff.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxtiff.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxtiff.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxtiff.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxtiff" +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" -# PROP Intermediate_Dir "vc_mswunivudll\wxtiff" +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxtiff.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxtiff.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxtiff.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxtiff.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -284,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivd\" # PROP Intermediate_Dir "vc_mswunivd\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -295,51 +318,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxtiffd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxtiffd.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" -# PROP BASE Intermediate_Dir "vc_mswud\wxtiff" +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" -# PROP Intermediate_Dir "vc_mswud\wxtiff" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxtiffd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxtiffd.lib" - -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static wxUniv Release Ansi" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxtiff" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\wxtiff" +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxtiff.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxtiff.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxtiffd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxtiffd.lib" !ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Native Debug Ansi" @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -364,72 +364,72 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxtiffd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxtiffd.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxtiff" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\wxtiff" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxtiffd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxtiffd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxtiff.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxtiff.lib" -!ELSEIF "$(CFG)" == "wxtiff - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "wxtiff - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" -# PROP BASE Intermediate_Dir "vc_mswd\wxtiff" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" -# PROP Intermediate_Dir "vc_mswd\wxtiff" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxtiff.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxtiffd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxtiffd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxtiff.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxtiff.lib" !ENDIF # Begin Target -# Name "wxtiff - Win32 Static Native Release Unicode" +# Name "wxtiff - Win32 LIB wxUniv Debug Unicode" # Name "wxtiff - Win32 DLL Native Release Ansi" # Name "wxtiff - Win32 DLL wxUniv Debug Unicode" -# Name "wxtiff - Win32 DLL Native Debug Unicode" +# Name "wxtiff - Win32 DLL wxUniv Release Unicode" # Name "wxtiff - Win32 DLL wxUniv Release Ansi" -# Name "wxtiff - Win32 Static Native Release Ansi" +# Name "wxtiff - Win32 LIB Native Debug Unicode" # Name "wxtiff - Win32 DLL wxUniv Debug Ansi" +# Name "wxtiff - Win32 LIB Native Debug Ansi" # Name "wxtiff - Win32 DLL Native Release Unicode" -# Name "wxtiff - Win32 Static wxUniv Release Unicode" -# Name "wxtiff - Win32 DLL wxUniv Release Unicode" -# Name "wxtiff - Win32 Static wxUniv Debug Ansi" -# Name "wxtiff - Win32 Static Native Debug Unicode" -# Name "wxtiff - Win32 Static wxUniv Release Ansi" +# Name "wxtiff - Win32 LIB wxUniv Release Ansi" +# Name "wxtiff - Win32 LIB Native Release Unicode" +# Name "wxtiff - Win32 LIB wxUniv Debug Ansi" +# Name "wxtiff - Win32 DLL Native Debug Unicode" # Name "wxtiff - Win32 DLL Native Debug Ansi" -# Name "wxtiff - Win32 Static wxUniv Debug Unicode" -# Name "wxtiff - Win32 Static Native Debug Ansi" +# Name "wxtiff - Win32 LIB Native Release Ansi" +# Name "wxtiff - Win32 LIB wxUniv Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/build/wx_wxzlib.dsp b/build/wx_wxzlib.dsp index 0601f82094..6ebb0c8269 100644 --- a/build/wx_wxzlib.dsp +++ b/build/wx_wxzlib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=wxzlib - Win32 Static Native Release Unicode +CFG=wxzlib - Win32 LIB wxUniv Debug Unicode !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=wxzlib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 LIB wxUniv Debug Unicode" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxzlib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxzlib - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxzlib - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxzlib - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxzlib - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE "wxzlib - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "wxzlib - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "wxzlib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "wxzlib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,28 +42,28 @@ CFG=wxzlib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxzlib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "wxzlib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" -# PROP BASE Intermediate_Dir "vc_mswu\wxzlib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" -# PROP Intermediate_Dir "vc_mswu\wxzlib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxzlib.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxzlib.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxzlibd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxzlibd.lib" !ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Native Release Ansi" @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -111,28 +111,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxzlibd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxzlibd.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxzlib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" -# PROP Intermediate_Dir "vc_mswuddll\wxzlib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Intermediate_Dir "vc_mswunivudll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxzlibd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxzlibd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxzlib.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxzlib.lib" !ELSEIF "$(CFG)" == "wxzlib - Win32 DLL wxUniv Release Ansi" @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -157,28 +157,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxzlib.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxzlib.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" -# PROP BASE Intermediate_Dir "vc_msw\wxzlib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Intermediate_Dir "vc_mswud\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" -# PROP Intermediate_Dir "vc_msw\wxzlib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Intermediate_Dir "vc_mswud\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxzlib.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxzlib.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxzlibd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxzlibd.lib" !ELSEIF "$(CFG)" == "wxzlib - Win32 DLL wxUniv Debug Ansi" @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -203,6 +203,29 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxzlibd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxzlibd.lib" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Intermediate_Dir "vc_mswd\wxzlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Intermediate_Dir "vc_mswd\wxzlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxzlibd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxzlibd.lib" + !ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Native Release Unicode" # PROP BASE Use_MFC 0 @@ -215,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -226,53 +249,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxzlib.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxzlib.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB wxUniv Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib" +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\wxzlib" +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxzlib.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxzlib.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxzlib.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxzlib.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib" +# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Intermediate_Dir "vc_mswu\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" -# PROP Intermediate_Dir "vc_mswunivudll\wxzlib" +# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Intermediate_Dir "vc_mswu\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxzlib.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxzlib.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxzlib.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxzlib.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -284,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswunivd\" # PROP Intermediate_Dir "vc_mswunivd\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -295,51 +318,28 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxzlibd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxzlibd.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" -# PROP BASE Intermediate_Dir "vc_mswud\wxzlib" +# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Intermediate_Dir "vc_mswuddll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" -# PROP Intermediate_Dir "vc_mswud\wxzlib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxzlibd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxzlibd.lib" - -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static wxUniv Release Ansi" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\wxzlib" +# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Intermediate_Dir "vc_mswuddll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c -# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxzlib.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxzlib.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxzlibd.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxzlibd.lib" !ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Native Debug Ansi" @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -364,72 +364,72 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxzlibd.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxzlibd.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static wxUniv Debug Unicode" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxzlib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Intermediate_Dir "vc_msw\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\wxzlib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw\" +# PROP Intermediate_Dir "vc_msw\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxzlibd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxzlibd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxzlib.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxzlib.lib" -!ELSEIF "$(CFG)" == "wxzlib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "wxzlib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" -# PROP BASE Intermediate_Dir "vc_mswd\wxzlib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" -# PROP Intermediate_Dir "vc_mswd\wxzlib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\wxzlib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxzlibd.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxzlibd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxzlib.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxzlib.lib" !ENDIF # Begin Target -# Name "wxzlib - Win32 Static Native Release Unicode" +# Name "wxzlib - Win32 LIB wxUniv Debug Unicode" # Name "wxzlib - Win32 DLL Native Release Ansi" # Name "wxzlib - Win32 DLL wxUniv Debug Unicode" -# Name "wxzlib - Win32 DLL Native Debug Unicode" +# Name "wxzlib - Win32 DLL wxUniv Release Unicode" # Name "wxzlib - Win32 DLL wxUniv Release Ansi" -# Name "wxzlib - Win32 Static Native Release Ansi" +# Name "wxzlib - Win32 LIB Native Debug Unicode" # Name "wxzlib - Win32 DLL wxUniv Debug Ansi" +# Name "wxzlib - Win32 LIB Native Debug Ansi" # Name "wxzlib - Win32 DLL Native Release Unicode" -# Name "wxzlib - Win32 Static wxUniv Release Unicode" -# Name "wxzlib - Win32 DLL wxUniv Release Unicode" -# Name "wxzlib - Win32 Static wxUniv Debug Ansi" -# Name "wxzlib - Win32 Static Native Debug Unicode" -# Name "wxzlib - Win32 Static wxUniv Release Ansi" +# Name "wxzlib - Win32 LIB wxUniv Release Ansi" +# Name "wxzlib - Win32 LIB Native Release Unicode" +# Name "wxzlib - Win32 LIB wxUniv Debug Ansi" +# Name "wxzlib - Win32 DLL Native Debug Unicode" # Name "wxzlib - Win32 DLL Native Debug Ansi" -# Name "wxzlib - Win32 Static wxUniv Debug Unicode" -# Name "wxzlib - Win32 Static Native Debug Ansi" +# Name "wxzlib - Win32 LIB Native Release Ansi" +# Name "wxzlib - Win32 LIB wxUniv Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/build/wx_xmldll.dsp b/build/wx_xmldll.dsp index b84598de93..a10066cabb 100644 --- a/build/wx_xmldll.dsp +++ b/build/wx_xmldll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswuddll\" # PROP Intermediate_Dir "vc_mswuddll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -72,8 +72,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswdll\" # PROP Intermediate_Dir "vc_mswdll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivuddll\" # PROP Intermediate_Dir "vc_mswunivuddll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivudll\" # PROP Intermediate_Dir "vc_mswunivudll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswddll\" # PROP Intermediate_Dir "vc_mswddll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -172,8 +172,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivdll\" # PROP Intermediate_Dir "vc_mswunivdll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswunivddll\" # PROP Intermediate_Dir "vc_mswunivddll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML @@ -222,8 +222,8 @@ LINK32=link.exe # PROP Output_Dir "..\lib\vc_mswudll\" # PROP Intermediate_Dir "vc_mswudll\xmldll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML diff --git a/build/wx_xmllib.dsp b/build/wx_xmllib.dsp index 15a75f2f7e..e60f48ce01 100644 --- a/build/wx_xmllib.dsp +++ b/build/wx_xmllib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=xmllib - Win32 Static Native Release Unicode +CFG=xmllib - Win32 LIB wxUniv Release Ansi !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,18 +13,18 @@ CFG=xmllib - Win32 Static Native Release Unicode !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "wx_xmllib.mak" CFG="xmllib - Win32 Static Native Release Unicode" +!MESSAGE NMAKE /f "wx_xmllib.mak" CFG="xmllib - Win32 LIB wxUniv Release Ansi" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "xmllib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library") -!MESSAGE "xmllib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "xmllib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -34,7 +34,30 @@ CFG=xmllib - Win32 Static Native Release Unicode CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "xmllib - Win32 Static Native Release Unicode" +!IF "$(CFG)" == "xmllib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Intermediate_Dir "vc_mswuniv\xmllib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Intermediate_Dir "vc_mswuniv\xmllib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_xml.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_xml.lib" + +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB Native Release Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -46,8 +69,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib\vc_mswu\" # PROP Intermediate_Dir "vc_mswu\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -57,30 +80,30 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u_xml.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static wxUniv Release Unicode" +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB wxUniv Debug Ansi" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" -# PROP BASE Intermediate_Dir "vc_mswunivu\xmllib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Intermediate_Dir "vc_mswunivd\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" -# PROP Intermediate_Dir "vc_mswunivu\xmllib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Intermediate_Dir "vc_mswunivd\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_xml.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_xml.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_xml.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static Native Release Ansi" +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB Native Release Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -92,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_msw\" # PROP Intermediate_Dir "vc_msw\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -103,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxbase25_xml.lib" # ADD LIB32 /nologo /out:"..\lib\vc_msw\wxbase25_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static Native Debug Unicode" +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB Native Debug Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -115,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswud\" # PROP Intermediate_Dir "vc_mswud\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -126,53 +149,53 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud_xml.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static wxUniv Debug Ansi" +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB wxUniv Release Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" -# PROP BASE Intermediate_Dir "vc_mswunivd\xmllib" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# PROP BASE Intermediate_Dir "vc_mswunivu\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" -# PROP Intermediate_Dir "vc_mswunivd\xmllib" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Intermediate_Dir "vc_mswunivu\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_xml.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_xml.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_xml.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static wxUniv Release Ansi" +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB wxUniv Debug Unicode" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" -# PROP BASE Intermediate_Dir "vc_mswuniv\xmllib" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# PROP BASE Intermediate_Dir "vc_mswunivud\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" -# PROP Intermediate_Dir "vc_mswuniv\xmllib" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Intermediate_Dir "vc_mswunivud\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c -# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_xml.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_xml.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_xml.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static Native Debug Ansi" +!ELSEIF "$(CFG)" == "xmllib - Win32 LIB Native Debug Ansi" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -184,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib\vc_mswd\" # PROP Intermediate_Dir "vc_mswd\xmllib" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -195,41 +218,18 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d_xml.lib" # ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d_xml.lib" -!ELSEIF "$(CFG)" == "xmllib - Win32 Static wxUniv Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" -# PROP BASE Intermediate_Dir "vc_mswunivud\xmllib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" -# PROP Intermediate_Dir "vc_mswunivud\xmllib" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_xml.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_xml.lib" - !ENDIF # Begin Target -# Name "xmllib - Win32 Static Native Release Unicode" -# Name "xmllib - Win32 Static wxUniv Release Unicode" -# Name "xmllib - Win32 Static Native Release Ansi" -# Name "xmllib - Win32 Static Native Debug Unicode" -# Name "xmllib - Win32 Static wxUniv Debug Ansi" -# Name "xmllib - Win32 Static wxUniv Release Ansi" -# Name "xmllib - Win32 Static Native Debug Ansi" -# Name "xmllib - Win32 Static wxUniv Debug Unicode" +# Name "xmllib - Win32 LIB wxUniv Release Ansi" +# Name "xmllib - Win32 LIB Native Release Unicode" +# Name "xmllib - Win32 LIB wxUniv Debug Ansi" +# Name "xmllib - Win32 LIB Native Release Ansi" +# Name "xmllib - Win32 LIB Native Debug Unicode" +# Name "xmllib - Win32 LIB wxUniv Release Unicode" +# Name "xmllib - Win32 LIB wxUniv Debug Unicode" +# Name "xmllib - Win32 LIB Native Debug Ansi" # Begin Group "Common Headers" # PROP Default_Filter "" diff --git a/wx-config.in b/wx-config.in index 31304e9775..1f84557a95 100755 --- a/wx-config.in +++ b/wx-config.in @@ -53,7 +53,7 @@ LIBS="@LIBS@" # Linker flags for sublibraries: CORE_BASE_LIBS="xml net base" -CORE_GUI_LIBS="html core" +CORE_GUI_LIBS="html adv core" ldlibs_base="@WXCONFIG_EXTRALIBS@" ldlibs_core="@EXTRALIBS_GUI@" -- 2.45.2