From 83b9886f1772dd5d27d986a2bde9f64a69989141 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 3 Aug 2003 20:26:51 +0000 Subject: [PATCH] added wxDbGrid git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/files.bkl | 11 +- build/bakefiles/monolithic.bkl | 2 +- build/bakefiles/multilib.bkl | 25 ++- build/bakefiles/wxwin.py | 7 +- build/makefile.bcc | 112 +++++++++---- build/makefile.gcc | 109 ++++++++++--- build/makefile.vc | 252 ++++++++++++++++++++---------- build/makefile.wat | 152 +++++++++++++----- build/wx.dsw | 60 ++++++- build/wx_advdll.dsp | 32 ++-- build/wx_advlib.dsp | 32 ++-- build/wx_basedll.dsp | 32 ++-- build/wx_baselib.dsp | 32 ++-- build/wx_coredll.dsp | 32 ++-- build/wx_corelib.dsp | 32 ++-- build/wx_dbgriddll.dsp | 278 +++++++++++++++++++++++++++++++++ build/wx_dbgridlib.dsp | 261 +++++++++++++++++++++++++++++++ build/wx_gldll.dsp | 32 ++-- build/wx_gllib.dsp | 32 ++-- build/wx_htmldll.dsp | 32 ++-- build/wx_htmllib.dsp | 32 ++-- build/wx_netdll.dsp | 32 ++-- build/wx_netlib.dsp | 32 ++-- build/wx_odbcdll.dsp | 104 ++++++------ build/wx_odbclib.dsp | 104 ++++++------ build/wx_wxexpat.dsp | 64 ++++---- build/wx_wxjpeg.dsp | 64 ++++---- build/wx_wxpng.dsp | 64 ++++---- build/wx_wxregex.dsp | 64 ++++---- build/wx_wxtiff.dsp | 64 ++++---- build/wx_wxzlib.dsp | 64 ++++---- build/wx_xmldll.dsp | 32 ++-- build/wx_xmllib.dsp | 32 ++-- include/wx/dbgrid.h | 8 +- include/wx/defs.h | 12 ++ 35 files changed, 1609 insertions(+), 720 deletions(-) create mode 100644 build/wx_dbgriddll.dsp create mode 100644 build/wx_dbgridlib.dsp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index c87a7ab06a..35f105b72a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2086,16 +2086,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/db.cpp - src/common/dbgrid.cpp src/common/dbtable.cpp wx/db.h - wx/dbgrid.h wx/dbkeyg.h wx/dbtable.h + + src/common/dbgrid.cpp + + + wx/dbgrid.h + + @@ -2245,7 +2250,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(NET_CMN_HDR) $(NET_PLATFORM_HDR) $(ALL_GUI_HEADERS) $(ADVANCED_HDR) $(HTML_HDR) $(XML_HDR) - $(OPENGL_HDR) $(ODBC_HDR) + $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR) diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl index 188ad3734c..2880c8e2f4 100644 --- a/build/bakefiles/monolithic.bkl +++ b/build/bakefiles/monolithic.bkl @@ -4,7 +4,7 @@ - $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) + $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC) diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 4cf98944a9..befb320384 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -96,23 +96,40 @@ - WXUSINGDLL WXMAKINGDLL_ODBC $(ODBC_SRC) $(ODBC_HDR) - advdll - coredll basedll $(EXTRALIBS_ODBC) - $(ODBC_SRC) $(ODBC_HDR) + + + + WXUSINGDLL + WXMAKINGDLL_DBGRID + $(DBGRID_SRC) + $(DBGRID_HDR) + advdll + odbcdll + coredll + basedll + + + + $(DBGRID_SRC) + $(DBGRID_HDR) + diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py index 07b3075b11..0f8facd4df 100644 --- a/build/bakefiles/wxwin.py +++ b/build/bakefiles/wxwin.py @@ -30,10 +30,11 @@ def mk_wxid(id): # All libs that are part of the main library (i.e. non-contrib): -MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'odbc'] +MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', + 'odbc', 'dbgrid'] # List of library names/ids for categories with different names: -LIBS_NOGUI = ['xml', 'net'] -LIBS_GUI = ['core', 'adv', 'html', 'gl', 'odbc'] +LIBS_NOGUI = ['xml', 'net', 'odbc'] +LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid'] def mkLibName(wxid): """Returns string that can be used as library name, including name diff --git a/build/makefile.bcc b/build/makefile.bcc index 74e1399664..53376734b2 100644 --- a/build/makefile.bcc +++ b/build/makefile.bcc @@ -256,6 +256,23 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) +DBGRIDDLL_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_DBGRID $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_dbgriddll.csm +DBGRIDDLL_OBJECTS = \ + $(OBJS)\dbgriddll_dummy.obj \ + $(OBJS)\dbgriddll_dbgrid.obj +DBGRIDLIB_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_dbgridlib.csm +DBGRIDLIB_OBJECTS = \ + $(OBJS)\dbgridlib_dummy.obj \ + $(OBJS)\dbgridlib_dbgrid.obj GLDLL_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 \ @@ -580,7 +597,6 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.obj \ $(OBJS)\odbcdll_db.obj \ - $(OBJS)\odbcdll_dbgrid.obj \ $(OBJS)\odbcdll_dbtable.obj ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ @@ -590,7 +606,6 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.obj \ $(OBJS)\odbclib_db.obj \ - $(OBJS)\odbclib_dbgrid.obj \ $(OBJS)\odbclib_dbtable.obj WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ -tWM -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS) @@ -813,10 +828,10 @@ __RUNTIME_LIBS = -tWR __RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i +__RUNTIME_LIBS_9 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = +__RUNTIME_LIBS_9 = !endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 @@ -2388,8 +2403,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_winpars.obj \ $(OBJS)\monolib_htmllbox.obj \ $(OBJS)\monolib_db.obj \ - $(OBJS)\monolib_dbgrid.obj \ - $(OBJS)\monolib_dbtable.obj + $(OBJS)\monolib_dbtable.obj \ + $(OBJS)\monolib_dbgrid.obj !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ @@ -2432,8 +2447,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj \ $(OBJS)\monodll_db.obj \ - $(OBJS)\monodll_dbgrid.obj \ - $(OBJS)\monodll_dbtable.obj + $(OBJS)\monodll_dbtable.obj \ + $(OBJS)\monodll_dbgrid.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __advdll___depname = \ @@ -2459,6 +2474,14 @@ __coredll___depname = \ __corelib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__dbgriddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__dbgridlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +!endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll @@ -2493,11 +2516,11 @@ __netlib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __odbcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __odbclib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib !endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib @@ -2524,7 +2547,7 @@ $(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) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___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) $** @@ -5242,6 +5265,18 @@ $(OBJS)\corelib_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +$(OBJS)\dbgriddll_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $** + +$(OBJS)\dbgriddll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $** + +$(OBJS)\dbgridlib_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) $** + +$(OBJS)\dbgridlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) -H $** + $(OBJS)\gldll_dummy.obj: ..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $** @@ -8363,9 +8398,6 @@ $(OBJS)\netlib_url.obj: ..\src\common\url.cpp $(OBJS)\odbcdll_db.obj: ..\src\common\db.cpp $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** -$(OBJS)\odbcdll_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** - $(OBJS)\odbcdll_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** @@ -8375,9 +8407,6 @@ $(OBJS)\odbcdll_dummy.obj: ..\src\msw\dummy.cpp $(OBJS)\odbclib_db.obj: ..\src\common\db.cpp $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $** -$(OBJS)\odbclib_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $** - $(OBJS)\odbclib_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $** @@ -8750,7 +8779,7 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp !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 import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + 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 import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@ !endif @@ -8766,7 +8795,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !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) @&&| - c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -8803,9 +8832,12 @@ clean: -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)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.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 @@ -8819,7 +8851,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@ !endif @@ -8832,10 +8864,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li | !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(DBGRIDDLL_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)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(DBGRIDLIB_OBJECTS) +| +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_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) @&&| - c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@ !endif @@ -8851,7 +8899,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_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 $(HTMLDLL_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 import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(HTMLDLL_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 import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@ !endif @@ -8873,7 +8921,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_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) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -8892,7 +8940,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@ !endif @@ -8906,15 +8954,15 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ODBCDLL_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)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@ + implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| $(ODBCLIB_OBJECTS) @@ -8971,7 +9019,7 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,, + c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@ !endif diff --git a/build/makefile.gcc b/build/makefile.gcc index 962cce0b68..a1656482c1 100644 --- a/build/makefile.gcc +++ b/build/makefile.gcc @@ -246,6 +246,22 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.o \ $(OBJS)\corelib_volume.o \ $(____CORE_SRC_FILENAMES_3_OBJECTS) +DBGRIDDLL_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_DBGRID $(CXXFLAGS) +DBGRIDDLL_OBJECTS = \ + $(OBJS)\dbgriddll_dummy.o \ + $(OBJS)\dbgriddll_dbgrid.o +DBGRIDLIB_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) +DBGRIDLIB_OBJECTS = \ + $(OBJS)\dbgridlib_dummy.o \ + $(OBJS)\dbgridlib_dbgrid.o GLDLL_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 \ @@ -568,7 +584,6 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.o \ $(OBJS)\odbcdll_db.o \ - $(OBJS)\odbcdll_dbgrid.o \ $(OBJS)\odbcdll_dbtable.o ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ @@ -578,7 +593,6 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.o \ $(OBJS)\odbclib_db.o \ - $(OBJS)\odbclib_dbgrid.o \ $(OBJS)\odbclib_dbtable.o WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS) @@ -2391,8 +2405,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_winpars.o \ $(OBJS)\monolib_htmllbox.o \ $(OBJS)\monolib_db.o \ - $(OBJS)\monolib_dbgrid.o \ - $(OBJS)\monolib_dbtable.o + $(OBJS)\monolib_dbtable.o \ + $(OBJS)\monolib_dbgrid.o endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ @@ -2435,8 +2449,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_winpars.o \ $(OBJS)\monodll_htmllbox.o \ $(OBJS)\monodll_db.o \ - $(OBJS)\monodll_dbgrid.o \ - $(OBJS)\monodll_dbtable.o + $(OBJS)\monodll_dbtable.o \ + $(OBJS)\monodll_dbgrid.o endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) @@ -2482,6 +2496,26 @@ __corelib___depname = \ endif endif endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +ifeq ($(USE_ODBC),1) +__dbgriddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll +endif +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +ifeq ($(USE_ODBC),1) +__dbgridlib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a +endif +endif +endif +endif ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) @@ -2543,7 +2577,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) __odbcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll endif endif endif @@ -2553,7 +2587,7 @@ ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) __odbclib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a + $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a endif endif endif @@ -2587,7 +2621,7 @@ $(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) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___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) $< @@ -5505,6 +5539,18 @@ $(OBJS)\corelib_xpmdecod.o: ..\src\common\xpmdecod.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +$(OBJS)\dbgriddll_dbgrid.o: ..\src\common\dbgrid.cpp + $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< + +$(OBJS)\dbgriddll_dummy.o: ..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< + +$(OBJS)\dbgridlib_dbgrid.o: ..\src\common\dbgrid.cpp + $(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $< + +$(OBJS)\dbgridlib_dummy.o: ..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.o: ..\src\msw\dummy.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $< @@ -8826,9 +8872,6 @@ $(OBJS)\netlib_url.o: ..\src\common\url.cpp $(OBJS)\odbcdll_db.o: ..\src\common\db.cpp $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< -$(OBJS)\odbcdll_dbgrid.o: ..\src\common\dbgrid.cpp - $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< - $(OBJS)\odbcdll_dbtable.o: ..\src\common\dbtable.cpp $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< @@ -8838,9 +8881,6 @@ $(OBJS)\odbcdll_dummy.o: ..\src\msw\dummy.cpp $(OBJS)\odbclib_db.o: ..\src\common\db.cpp $(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $< -$(OBJS)\odbclib_dbgrid.o: ..\src\common\dbgrid.cpp - $(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $< - $(OBJS)\odbclib_dbtable.o: ..\src\common\dbtable.cpp $(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $< @@ -9269,9 +9309,12 @@ clean: -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)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a + -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.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 @@ -9302,6 +9345,30 @@ endif endif endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +ifeq ($(USE_ODBC),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.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)_adv.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +endif +endif +endif +endif + +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +ifeq ($(USE_ODBC),1) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(DBGRIDLIB_OBJECTS) + ranlib $@ +endif +endif +endif +endif + ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) @@ -9387,8 +9454,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.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)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.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)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a endif endif endif @@ -9398,7 +9465,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(ODBCLIB_OBJECTS) ranlib $@ diff --git a/build/makefile.vc b/build/makefile.vc index 448f822ef3..c5f12883ab 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -13,7 +13,7 @@ ### Variables: ### ADVDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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 \ @@ -38,7 +38,7 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_taskbar.obj \ $(OBJS)\advdll_wave.obj ADVLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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 \ @@ -63,14 +63,14 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_wave.obj BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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_37) \ + $(__DEBUGINFO_38) \ /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) \ @@ -148,14 +148,14 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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_37) \ + $(__DEBUGINFO_38) \ /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) \ @@ -233,7 +233,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \ - /DWIN32 $(__DEBUGINFO_37) \ + /DWIN32 $(__DEBUGINFO_38) \ /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 \ @@ -251,7 +251,7 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \ - /DWIN32 $(__DEBUGINFO_37) \ + /DWIN32 $(__DEBUGINFO_38) \ /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 \ @@ -268,10 +268,32 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \ - $(__DEBUGINFO_37) \ +DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb \ + $(____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_DBGRID \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" +DBGRIDDLL_OBJECTS = \ + $(OBJS)\dbgriddll_dummy.obj \ + $(OBJS)\dbgriddll_dbgrid.obj +DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.pdb \ + $(____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" \ + /Fp"$(OBJS)\wxprec_dbgridlib.pch" +DBGRIDLIB_OBJECTS = \ + $(OBJS)\dbgridlib_dummy.obj \ + $(OBJS)\dbgridlib_dbgrid.obj +GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_194_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_212_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) \ @@ -279,10 +301,10 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \ GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \ - $(__DEBUGINFO_37) \ +GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_222) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \ - $(____DEBUGRUNTIME_203_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_221_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" \ @@ -290,10 +312,10 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \ GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcanvas.obj -HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) \ - /DWIN32 $(__DEBUGINFO_37) \ +HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) \ + /DWIN32 $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_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_HTML \ @@ -322,10 +344,10 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_tables.obj \ $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) \ - /DWIN32 $(__DEBUGINFO_37) \ +HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_186) \ + /DWIN32 $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.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" \ @@ -357,14 +379,14 @@ HTMLLIB_OBJECTS = \ LIBDIRNAME = \ ..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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_37) \ + $(__DEBUGINFO_38) \ /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) \ @@ -456,14 +478,14 @@ MONODLL_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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_37) \ + $(__DEBUGINFO_38) \ /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) \ @@ -555,14 +577,14 @@ MONOLIB_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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_37) \ + $(__DEBUGINFO_38) \ /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) \ @@ -584,14 +606,14 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_gsocket.obj \ $(OBJS)\netdll_gsockmsw.obj NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \ - $(__DEBUGINFO_37) \ + $(__DEBUGINFO_38) \ /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_37) \ + $(__DEBUGINFO_38) \ /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) \ @@ -615,8 +637,8 @@ NETLIB_OBJECTS = \ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \ - /DWIN32 $(__DEBUGINFO_37) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \ $(____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 \ @@ -625,11 +647,10 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \ ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.obj \ $(OBJS)\odbcdll_db.obj \ - $(OBJS)\odbcdll_dbgrid.obj \ $(OBJS)\odbcdll_dbtable.obj ODBCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) \ - /DWIN32 $(__DEBUGINFO_37) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \ $(____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 \ @@ -638,10 +659,9 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) \ ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.obj \ $(OBJS)\odbclib_db.obj \ - $(OBJS)\odbclib_dbgrid.obj \ $(OBJS)\odbclib_dbtable.obj WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 \ - $(__DEBUGINFO_37) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_42_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) \ /DCOMPILED_FROM_DSP $(CFLAGS) WXEXPAT_OBJECTS = \ @@ -649,7 +669,7 @@ WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 \ - $(__DEBUGINFO_37) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_26_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ @@ -699,7 +719,7 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_19) /DWIN32 \ - $(__DEBUGINFO_37) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_18_p) $(__OPTIMIZEFLAG) /I..\src\zlib $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ @@ -720,7 +740,7 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_37) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ @@ -728,7 +748,7 @@ WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_35) /DWIN32 \ - $(__DEBUGINFO_37) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_34_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ @@ -765,7 +785,7 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \ - $(__DEBUGINFO_37) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ @@ -782,10 +802,10 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infcodes.obj \ $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj -XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) /DWIN32 \ - $(__DEBUGINFO_37) \ +XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_176_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_194_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) \ @@ -793,10 +813,10 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) /DWIN32 \ XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj -XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_186) /DWIN32 \ - $(__DEBUGINFO_37) \ +XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \ - $(____DEBUGRUNTIME_185_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(____DEBUGRUNTIME_203_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" \ @@ -847,28 +867,28 @@ __DEBUGINFO = __DEBUGINFO = d !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_31 = /DEBUG +__DEBUGINFO_33 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_31 = +__DEBUGINFO_33 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_31 = +__DEBUGINFO_33 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_31 = /DEBUG +__DEBUGINFO_33 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_37 = /Zi +__DEBUGINFO_38 = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_37 = +__DEBUGINFO_38 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_37 = +__DEBUGINFO_38 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_37 = /Zi +__DEBUGINFO_38 = /Zi !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" __DEBUGRUNTIME_105 = @@ -997,6 +1017,24 @@ __DEBUGRUNTIME_204 = d __DEBUGRUNTIME_204 = $(__DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_213 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_213 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_213 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_222 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_222 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_222 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" __DEBUGRUNTIME_27 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" @@ -2781,6 +2819,24 @@ ____DEBUGRUNTIME_203_p = /D_DEBUG ____DEBUGRUNTIME_203_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_212_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_212_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_212_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_221_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_221_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_221_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_26_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" @@ -2911,8 +2967,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_winpars.obj \ $(OBJS)\monolib_htmllbox.obj \ $(OBJS)\monolib_db.obj \ - $(OBJS)\monolib_dbgrid.obj \ - $(OBJS)\monolib_dbtable.obj + $(OBJS)\monolib_dbtable.obj \ + $(OBJS)\monolib_dbgrid.obj !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ @@ -2955,8 +3011,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj \ $(OBJS)\monodll_db.obj \ - $(OBJS)\monodll_dbgrid.obj \ - $(OBJS)\monodll_dbtable.obj + $(OBJS)\monodll_dbtable.obj \ + $(OBJS)\monodll_dbgrid.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __advdll___depname = \ @@ -2982,6 +3038,14 @@ __coredll___depname = \ __corelib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__dbgriddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__dbgridlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +!endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll @@ -3016,11 +3080,11 @@ __netlib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __odbcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __odbclib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib !endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib @@ -3047,7 +3111,7 @@ $(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) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___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) $** @@ -5765,6 +5829,18 @@ $(OBJS)\corelib_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +$(OBJS)\dbgriddll_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $** + +$(OBJS)\dbgriddll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\dbgridlib_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $** + +$(OBJS)\dbgridlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $** + $(OBJS)\gldll_dummy.obj: ..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $** @@ -8886,9 +8962,6 @@ $(OBJS)\netlib_url.obj: ..\src\common\url.cpp $(OBJS)\odbcdll_db.obj: ..\src\common\db.cpp $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $** -$(OBJS)\odbcdll_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $** - $(OBJS)\odbcdll_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $** @@ -8898,9 +8971,6 @@ $(OBJS)\odbcdll_dummy.obj: ..\src\msw\dummy.cpp $(OBJS)\odbclib_db.obj: ..\src\common\db.cpp $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $** -$(OBJS)\odbclib_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $** - $(OBJS)\odbclib_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $** @@ -9272,7 +9342,7 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp !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_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /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 @@ -9287,7 +9357,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !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_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(BASEDLL_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 /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -9324,9 +9394,12 @@ clean: -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)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.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 @@ -9339,7 +9412,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(COREDLL_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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib << !endif @@ -9352,9 +9425,24 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li << !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(DBGRIDDLL_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)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(DBGRIDLIB_OBJECTS) +<< +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_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_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(GLDLL_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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib << !endif @@ -9369,7 +9457,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_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_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(HTMLDLL_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)_html.lib << !endif @@ -9390,7 +9478,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_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_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(MONODLL_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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -9408,7 +9496,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(NETDLL_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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib << !endif @@ -9422,14 +9510,14 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_31) /LIBPATH:$(LIBDIRNAME) @<< - $(ODBCDLL_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)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(ODBCDLL_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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(ODBCLIB_OBJECTS) @@ -9485,7 +9573,7 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_31) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(XMLDLL_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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib << !endif diff --git a/build/makefile.wat b/build/makefile.wat index 7d3112b23f..55ff3becca 100644 --- a/build/makefile.wat +++ b/build/makefile.wat @@ -79,22 +79,22 @@ __DEBUGINFO = -d0 !ifeq DEBUG_INFO 1 __DEBUGINFO = -d2 !endif -__DEBUGINFO_9 = +__DEBUGINFO_10 = !ifeq BUILD debug !ifeq DEBUG_INFO default -__DEBUGINFO_9 = debug all +__DEBUGINFO_10 = debug all !endif !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_9 = +__DEBUGINFO_10 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_9 = +__DEBUGINFO_10 = !endif !ifeq DEBUG_INFO 1 -__DEBUGINFO_9 = debug all +__DEBUGINFO_10 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug @@ -1727,8 +1727,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_winpars.obj & $(OBJS)\monolib_htmllbox.obj & $(OBJS)\monolib_db.obj & - $(OBJS)\monolib_dbgrid.obj & - $(OBJS)\monolib_dbtable.obj + $(OBJS)\monolib_dbtable.obj & + $(OBJS)\monolib_dbgrid.obj !endif ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 @@ -1772,8 +1772,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_winpars.obj & $(OBJS)\monodll_htmllbox.obj & $(OBJS)\monodll_db.obj & - $(OBJS)\monodll_dbgrid.obj & - $(OBJS)\monodll_dbtable.obj + $(OBJS)\monodll_dbtable.obj & + $(OBJS)\monodll_dbgrid.obj !endif __advdll___depname = !ifeq MONOLITHIC 0 @@ -1825,6 +1825,28 @@ __corelib___depname = & !endif !endif !endif +__dbgriddll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_GUI 1 +!ifeq USE_ODBC 1 +__dbgriddll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll +!endif +!endif +!endif +!endif +__dbgridlib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_GUI 1 +!ifeq USE_ODBC 1 +__dbgridlib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +!endif +!endif +!endif +!endif __gldll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 @@ -1895,7 +1917,7 @@ __odbcdll___depname = !ifeq USE_GUI 1 !ifeq USE_ODBC 1 __odbcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll !endif !endif !endif @@ -1906,7 +1928,7 @@ __odbclib___depname = !ifeq USE_GUI 1 !ifeq USE_ODBC 1 __odbclib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib !endif !endif !endif @@ -2180,6 +2202,23 @@ CORELIB_OBJECTS = & $(OBJS)\corelib_mslu.obj & $(OBJS)\corelib_volume.obj & $(____CORE_SRC_FILENAMES_3_OBJECTS) +DBGRIDDLL_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_DBGRID $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_dbgriddll.pch +DBGRIDDLL_OBJECTS = & + $(OBJS)\dbgriddll_dummy.obj & + $(OBJS)\dbgriddll_dbgrid.obj +DBGRIDLIB_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_dbgridlib.pch +DBGRIDLIB_OBJECTS = & + $(OBJS)\dbgridlib_dummy.obj & + $(OBJS)\dbgridlib_dbgrid.obj GLDLL_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 & @@ -2509,7 +2548,6 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & ODBCDLL_OBJECTS = & $(OBJS)\odbcdll_dummy.obj & $(OBJS)\odbcdll_db.obj & - $(OBJS)\odbcdll_dbgrid.obj & $(OBJS)\odbcdll_dbtable.obj ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & @@ -2519,7 +2557,6 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & ODBCLIB_OBJECTS = & $(OBJS)\odbclib_dummy.obj & $(OBJS)\odbclib_db.obj & - $(OBJS)\odbclib_dbgrid.obj & $(OBJS)\odbclib_dbtable.obj WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CFLAGS) @@ -2682,7 +2719,7 @@ $(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) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___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) $< @@ -5600,6 +5637,18 @@ $(OBJS)\corelib_xpmdecod.obj : .AUTODEPEND ..\src\common\xpmdecod.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +$(OBJS)\dbgriddll_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp + $(CXX) -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $< + +$(OBJS)\dbgriddll_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $< + +$(OBJS)\dbgridlib_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp + $(CXX) -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $< + +$(OBJS)\dbgridlib_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp $(CXX) -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< @@ -8921,9 +8970,6 @@ $(OBJS)\netlib_url.obj : .AUTODEPEND ..\src\common\url.cpp $(OBJS)\odbcdll_db.obj : .AUTODEPEND ..\src\common\db.cpp $(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< -$(OBJS)\odbcdll_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp - $(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< - $(OBJS)\odbcdll_dbtable.obj : .AUTODEPEND ..\src\common\dbtable.cpp $(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $< @@ -8933,9 +8979,6 @@ $(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp $(OBJS)\odbclib_db.obj : .AUTODEPEND ..\src\common\db.cpp $(CXX) -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $< -$(OBJS)\odbclib_dbgrid.obj : .AUTODEPEND ..\src\common\dbgrid.cpp - $(CXX) -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $< - $(OBJS)\odbclib_dbtable.obj : .AUTODEPEND ..\src\common\dbtable.cpp $(CXX) -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $< @@ -9313,7 +9356,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa @%append $(OBJS)\advdll.lbc option quiet @%append $(OBJS)\advdll.lbc name $^@ @%append $(OBJS)\advdll.lbc option incremental - @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) 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 @@ -9342,7 +9385,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(B @%append $(OBJS)\basedll.lbc option quiet @%append $(OBJS)\basedll.lbc name $^@ @%append $(OBJS)\basedll.lbc option incremental - @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.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) do @%append $(OBJS)\basedll.lbc library %i @%append $(OBJS)\basedll.lbc @@ -9387,9 +9430,12 @@ clean : .SYMBOLIC -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)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.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 @@ -9408,7 +9454,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w @%append $(OBJS)\coredll.lbc option quiet @%append $(OBJS)\coredll.lbc name $^@ @%append $(OBJS)\coredll.lbc option incremental - @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i @%append $(OBJS)\coredll.lbc @@ -9430,6 +9476,40 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !endif !endif +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_GUI 1 +!ifeq USE_ODBC 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll : $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + @%create $(OBJS)\dbgriddll.lbc + @%append $(OBJS)\dbgriddll.lbc option quiet + @%append $(OBJS)\dbgriddll.lbc name $^@ + @%append $(OBJS)\dbgriddll.lbc option incremental + @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.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)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i + @%append $(OBJS)\dbgriddll.lbc + @%append $(OBJS)\dbgriddll.lbc system nt_dll + wlink @$(OBJS)\dbgriddll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +$^@ +!endif +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_GUI 1 +!ifeq USE_ODBC 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib : $(DBGRIDLIB_OBJECTS) + @%create $(OBJS)\dbgridlib.lbc + @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\dbgridlib.lbc +!endif +!endif +!endif +!endif + !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 @@ -9438,7 +9518,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ @%append $(OBJS)\gldll.lbc option incremental - @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i @%append $(OBJS)\gldll.lbc @@ -9468,7 +9548,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w @%append $(OBJS)\htmldll.lbc option quiet @%append $(OBJS)\htmldll.lbc name $^@ @%append $(OBJS)\htmldll.lbc option incremental - @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.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)\htmldll.lbc library %i @%append $(OBJS)\htmldll.lbc @@ -9503,7 +9583,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V @%append $(OBJS)\monodll.lbc option quiet @%append $(OBJS)\monodll.lbc name $^@ @%append $(OBJS)\monodll.lbc option incremental - @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.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 ) do @%append $(OBJS)\monodll.lbc library %i @%append $(OBJS)\monodll.lbc @@ -9532,7 +9612,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : @%append $(OBJS)\netdll.lbc option quiet @%append $(OBJS)\netdll.lbc name $^@ @%append $(OBJS)\netdll.lbc option incremental - @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i @%append $(OBJS)\netdll.lbc @@ -9555,18 +9635,18 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) @%create $(OBJS)\odbcdll.lbc @%append $(OBJS)\odbcdll.lbc option quiet @%append $(OBJS)\odbcdll.lbc name $^@ @%append $(OBJS)\odbcdll.lbc option incremental - @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.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)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i @%append $(OBJS)\odbcdll.lbc @%append $(OBJS)\odbcdll.lbc system nt_dll wlink @$(OBJS)\odbcdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +$^@ !endif !endif !endif @@ -9576,7 +9656,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_w !ifeq SHARED 0 !ifeq USE_GUI 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS) @%create $(OBJS)\odbclib.lbc @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\odbclib.lbc @@ -9633,7 +9713,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : @%append $(OBJS)\xmldll.lbc option quiet @%append $(OBJS)\xmldll.lbc name $^@ @%append $(OBJS)\xmldll.lbc option incremental - @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_9) libpath $(LIBDIRNAME) + @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i @%append $(OBJS)\xmldll.lbc diff --git a/build/wx.dsw b/build/wx.dsw index 2053a91da9..e1f44371e0 100644 --- a/build/wx.dsw +++ b/build/wx.dsw @@ -137,6 +137,60 @@ Package=<4> ############################################################################### +Project: "dbgriddll"=wx_dbgriddll.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 advdll +End Project Dependency +Begin Project Dependency +Project_Dep_Name odbcdll +End Project Dependency +Begin Project Dependency +Project_Dep_Name coredll +End Project Dependency +Begin Project Dependency +Project_Dep_Name basedll +End Project Dependency +}}} + +############################################################################### + +Project: "dbgridlib"=wx_dbgridlib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "gldll"=wx_gldll.dsp - Package Owner=<4> Package=<5> @@ -299,12 +353,6 @@ Begin Project Dependency Project_Dep_Name wxregex End Project Dependency Begin Project Dependency -Project_Dep_Name advdll -End Project Dependency -Begin Project Dependency -Project_Dep_Name coredll -End Project Dependency -Begin Project Dependency Project_Dep_Name basedll End Project Dependency }}} diff --git a/build/wx_advdll.dsp b/build/wx_advdll.dsp index 7c1314832b..94147e97bb 100644 --- a/build/wx_advdll.dsp +++ b/build/wx_advdll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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 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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# 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 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 "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# 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 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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# 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 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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# 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 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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# 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 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 "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c diff --git a/build/wx_advlib.dsp b/build/wx_advlib.dsp index 58de6541cf..3085f13e34 100644 --- a/build/wx_advlib.dsp +++ b/build/wx_advlib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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 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 "__WXMSW__" /D wxUSE_UNICODE=1 /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 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 "__WXMSW__" /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 diff --git a/build/wx_basedll.dsp b/build/wx_basedll.dsp index de5d33e130..60b2800a55 100644 --- a/build/wx_basedll.dsp +++ b/build/wx_basedll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\basedll" # 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_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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\basedll" # 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_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\basedll" # 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_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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\basedll" # 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_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\basedll" # 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_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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\basedll" # 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_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\basedll" # 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_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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\basedll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\basedll" # 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_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c diff --git a/build/wx_baselib.dsp b/build/wx_baselib.dsp index 6c7da9e75d..261e921d0f 100644 --- a/build/wx_baselib.dsp +++ b/build/wx_baselib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\baselib" # 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\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\baselib" # 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\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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\baselib" # 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\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\baselib" # 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\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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\baselib" # 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\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\baselib" # 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\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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\baselib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\baselib" # 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\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 diff --git a/build/wx_coredll.dsp b/build/wx_coredll.dsp index 620e8cd6e0..68d9ad6b4d 100644 --- a/build/wx_coredll.dsp +++ b/build/wx_coredll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\coredll" # 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_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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\coredll" # 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_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\coredll" # 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_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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\coredll" # 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_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\coredll" # 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_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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\coredll" # 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_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\coredll" # 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_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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\coredll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\coredll" # 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_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c diff --git a/build/wx_corelib.dsp b/build/wx_corelib.dsp index 921da7930e..d88540df5e 100644 --- a/build/wx_corelib.dsp +++ b/build/wx_corelib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\corelib" # 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_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\corelib" # 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_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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\corelib" # 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_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\corelib" # 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_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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\corelib" # 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_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\corelib" # 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_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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\corelib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\corelib" # 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_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 diff --git a/build/wx_dbgriddll.dsp b/build/wx_dbgriddll.dsp new file mode 100644 index 0000000000..903ff08de8 --- /dev/null +++ b/build/wx_dbgriddll.dsp @@ -0,0 +1,278 @@ +# Microsoft Developer Studio Project File - Name="dbgriddll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=dbgriddll - 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_dbgriddll.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_dbgriddll.mak" CFG="dbgriddll - Win32 DLL Native Debug Unicode" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "dbgriddll - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "dbgriddll - 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)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\dbgriddll" +# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_DBGRID" /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_DBGRID" /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_DBGRID +# 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_DBGRID +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_adv.lib ..\lib\vc_mswuddll\wxbase25ud_odbc.lib ..\lib\vc_mswuddll\wxmsw25ud_core.lib ..\lib\vc_mswuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxmsw250ud_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxmsw25ud_dbgrid.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_adv.lib ..\lib\vc_mswuddll\wxbase25ud_odbc.lib ..\lib\vc_mswuddll\wxmsw25ud_core.lib ..\lib\vc_mswuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxmsw250ud_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxmsw25ud_dbgrid.lib" /debug + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\dbgriddll" +# 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_dbgriddll.pch" /Fd..\lib\vc_mswdll\wxmsw250_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Fd..\lib\vc_mswdll\wxmsw250_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /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_DBGRID +# ADD RSC /l 0x405 /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_DBGRID +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_adv.lib ..\lib\vc_mswdll\wxbase25_odbc.lib ..\lib\vc_mswdll\wxmsw25_core.lib ..\lib\vc_mswdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxmsw250_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxmsw25_dbgrid.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_adv.lib ..\lib\vc_mswdll\wxbase25_odbc.lib ..\lib\vc_mswdll\wxmsw25_core.lib ..\lib\vc_mswdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxmsw250_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxmsw25_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\dbgriddll" +# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_dbgrid_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_DBGRID" /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_DBGRID" /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_DBGRID" /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_DBGRID +# 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_DBGRID +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_adv.lib ..\lib\vc_mswunivuddll\wxbase25ud_odbc.lib ..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxmswuniv250ud_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxmswuniv25ud_dbgrid.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_adv.lib ..\lib\vc_mswunivuddll\wxbase25ud_odbc.lib ..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxmswuniv250ud_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxmswuniv25ud_dbgrid.lib" /debug + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\dbgriddll" +# 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_dbgriddll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /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_DBGRID +# ADD RSC /l 0x405 /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_DBGRID +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_adv.lib ..\lib\vc_mswunivudll\wxbase25u_odbc.lib ..\lib\vc_mswunivudll\wxmswuniv25u_core.lib ..\lib\vc_mswunivudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxmswuniv250u_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxmswuniv25u_dbgrid.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_adv.lib ..\lib\vc_mswunivudll\wxbase25u_odbc.lib ..\lib\vc_mswunivudll\wxmswuniv25u_core.lib ..\lib\vc_mswunivudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxmswuniv250u_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxmswuniv25u_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\dbgriddll" +# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_DBGRID +# 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_DBGRID +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_adv.lib ..\lib\vc_mswddll\wxbase25d_odbc.lib ..\lib\vc_mswddll\wxmsw25d_core.lib ..\lib\vc_mswddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxmsw250d_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxmsw25d_dbgrid.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_adv.lib ..\lib\vc_mswddll\wxbase25d_odbc.lib ..\lib\vc_mswddll\wxmsw25d_core.lib ..\lib\vc_mswddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxmsw250d_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxmsw25d_dbgrid.lib" /debug + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\dbgriddll" +# 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_dbgriddll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /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_DBGRID +# ADD RSC /l 0x405 /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_DBGRID +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_adv.lib ..\lib\vc_mswunivdll\wxbase25_odbc.lib ..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxmswuniv250_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxmswuniv25_dbgrid.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_adv.lib ..\lib\vc_mswunivdll\wxbase25_odbc.lib ..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxmswuniv250_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxmswuniv25_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\dbgriddll" +# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_DBGRID +# 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_DBGRID +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_adv.lib ..\lib\vc_mswunivddll\wxbase25d_odbc.lib ..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxmswuniv250d_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxmswuniv25d_dbgrid.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_adv.lib ..\lib\vc_mswunivddll\wxbase25d_odbc.lib ..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxmswuniv250d_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxmswuniv25d_dbgrid.lib" /debug + +!ELSEIF "$(CFG)" == "dbgriddll - 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\dbgriddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\dbgriddll" +# 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_dbgriddll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgriddll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_dbgrid_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /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_DBGRID +# ADD RSC /l 0x405 /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_DBGRID +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_adv.lib ..\lib\vc_mswudll\wxbase25u_odbc.lib ..\lib\vc_mswudll\wxmsw25u_core.lib ..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxmsw250u_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxmsw25u_dbgrid.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_adv.lib ..\lib\vc_mswudll\wxbase25u_odbc.lib ..\lib\vc_mswudll\wxmsw25u_core.lib ..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxmsw250u_dbgrid_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxmsw25u_dbgrid.lib" + +!ENDIF + +# Begin Target + +# Name "dbgriddll - Win32 DLL Native Debug Unicode" +# Name "dbgriddll - Win32 DLL Native Release Ansi" +# Name "dbgriddll - Win32 DLL wxUniv Debug Unicode" +# Name "dbgriddll - Win32 DLL wxUniv Release Unicode" +# Name "dbgriddll - Win32 DLL Native Debug Ansi" +# Name "dbgriddll - Win32 DLL wxUniv Release Ansi" +# Name "dbgriddll - Win32 DLL wxUniv Debug Ansi" +# Name "dbgriddll - Win32 DLL Native Release Unicode" +# Begin Group "Common Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\dbgrid.h +# 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_dbgridlib.dsp b/build/wx_dbgridlib.dsp new file mode 100644 index 0000000000..2312c0063e --- /dev/null +++ b/build/wx_dbgridlib.dsp @@ -0,0 +1,261 @@ +# Microsoft Developer Studio Project File - Name="dbgridlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=dbgridlib - 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_dbgridlib.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_dbgridlib.mak" CFG="dbgridlib - Win32 LIB wxUniv Release Ansi" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "dbgridlib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "dbgridlib - 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)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswu" +# PROP Intermediate_Dir "vc_mswu\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_msw" +# PROP Intermediate_Dir "vc_msw\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswud" +# PROP Intermediate_Dir "vc_mswud\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\lib\vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /D "WIN32" /D "_LIB" /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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_dbgrid.lib" + +!ELSEIF "$(CFG)" == "dbgridlib - 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\dbgridlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\lib\vc_mswd" +# PROP Intermediate_Dir "vc_mswd\dbgridlib" +# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.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_dbgrid.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_dbgrid.lib" + +!ENDIF + +# Begin Target + +# Name "dbgridlib - Win32 LIB wxUniv Release Ansi" +# Name "dbgridlib - Win32 LIB Native Release Unicode" +# Name "dbgridlib - Win32 LIB wxUniv Debug Ansi" +# Name "dbgridlib - Win32 LIB Native Release Ansi" +# Name "dbgridlib - Win32 LIB Native Debug Unicode" +# Name "dbgridlib - Win32 LIB wxUniv Release Unicode" +# Name "dbgridlib - Win32 LIB wxUniv Debug Unicode" +# Name "dbgridlib - Win32 LIB Native Debug Ansi" +# Begin Group "Common Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\dbgrid.h +# 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_gldll.dsp b/build/wx_gldll.dsp index a74ce7b385..b9c6ddf2c7 100644 --- a/build/wx_gldll.dsp +++ b/build/wx_gldll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\gldll" # 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_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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\gldll" # 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_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\gldll" # 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_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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\gldll" # 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_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\gldll" # 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_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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\gldll" # 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_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\gldll" # 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_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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\gldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\gldll" # 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_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c diff --git a/build/wx_gllib.dsp b/build/wx_gllib.dsp index 6ed432980c..5093a8543b 100644 --- a/build/wx_gllib.dsp +++ b/build/wx_gllib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\gllib" # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\gllib" # 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_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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\gllib" # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\gllib" # 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_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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\gllib" # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\gllib" # 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_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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\gllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\gllib" # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c diff --git a/build/wx_htmldll.dsp b/build/wx_htmldll.dsp index 4e0837883c..adc6d455d1 100644 --- a/build/wx_htmldll.dsp +++ b/build/wx_htmldll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\htmldll" # 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_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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\htmldll" # 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_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\htmldll" # 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_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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\htmldll" # 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_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\htmldll" # 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_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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\htmldll" # 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_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\htmldll" # 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_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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\htmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\htmldll" # 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_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c diff --git a/build/wx_htmllib.dsp b/build/wx_htmllib.dsp index c155df929c..ec56149fd1 100644 --- a/build/wx_htmllib.dsp +++ b/build/wx_htmllib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\htmllib" # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\htmllib" # 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_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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\htmllib" # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\htmllib" # 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_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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\htmllib" # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\htmllib" # 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_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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\htmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\htmllib" # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c diff --git a/build/wx_netdll.dsp b/build/wx_netdll.dsp index 7f8d33a3a6..0fe0c87a07 100644 --- a/build/wx_netdll.dsp +++ b/build/wx_netdll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\netdll" # 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_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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\netdll" # 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_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\netdll" # 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_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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\netdll" # 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_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\netdll" # 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_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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\netdll" # 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_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\netdll" # 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_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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\netdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\netdll" # 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_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c diff --git a/build/wx_netlib.dsp b/build/wx_netlib.dsp index 19416b6eba..b543cec9d3 100644 --- a/build/wx_netlib.dsp +++ b/build/wx_netlib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\netlib" # 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\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\netlib" # 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\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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\netlib" # 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\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\netlib" # 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\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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\netlib" # 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\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\netlib" # 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\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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\netlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\netlib" # 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\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 diff --git a/build/wx_odbcdll.dsp b/build/wx_odbcdll.dsp index d0a09c1d84..01169d0070 100644 --- a/build/wx_odbcdll.dsp +++ b/build/wx_odbcdll.dsp @@ -39,16 +39,16 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\odbcdll" # 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_ODBC" /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_ODBC" /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_ODBC @@ -57,23 +57,23 @@ 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_adv.lib ..\lib\vc_mswuddll\wxmsw25ud_core.lib ..\lib\vc_mswuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxmsw250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxmsw25ud_odbc.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_adv.lib ..\lib\vc_mswuddll\wxmsw25ud_core.lib ..\lib\vc_mswuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxmsw250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxmsw25ud_odbc.lib" /debug +# 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\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxbase25ud_odbc.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\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswuddll" /implib:"..\lib\vc_mswuddll\wxbase25ud_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\odbcdll" # 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_odbcdll.pch" /Fd..\lib\vc_mswdll\wxmsw250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswdll\wxmsw250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /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_ODBC @@ -82,23 +82,23 @@ 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_adv.lib ..\lib\vc_mswdll\wxmsw25_core.lib ..\lib\vc_mswdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxmsw250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxmsw25_odbc.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_adv.lib ..\lib\vc_mswdll\wxmsw25_core.lib ..\lib\vc_mswdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxmsw250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxmsw25_odbc.lib" +# 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\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxbase250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxbase25_odbc.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\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswdll\wxbase250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswdll" /implib:"..\lib\vc_mswdll\wxbase25_odbc.lib" !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\odbcdll" # 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_odbc_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_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_odbc_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_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_odbc_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_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_odbc_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_ODBC" /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_ODBC" /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_ODBC" /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_ODBC @@ -107,23 +107,23 @@ 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_adv.lib ..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxmswuniv250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxmswuniv25ud_odbc.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_adv.lib ..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxmswuniv250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxmswuniv25ud_odbc.lib" /debug +# 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\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxbase25ud_odbc.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\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivuddll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivuddll" /implib:"..\lib\vc_mswunivuddll\wxbase25ud_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\odbcdll" # 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_odbcdll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /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_ODBC @@ -132,23 +132,23 @@ 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_adv.lib ..\lib\vc_mswunivudll\wxmswuniv25u_core.lib ..\lib\vc_mswunivudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxmswuniv250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxmswuniv25u_odbc.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_adv.lib ..\lib\vc_mswunivudll\wxmswuniv25u_core.lib ..\lib\vc_mswunivudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxmswuniv250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxmswuniv25u_odbc.lib" +# 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\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxbase25u_odbc.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\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivudll" /implib:"..\lib\vc_mswunivudll\wxbase25u_odbc.lib" !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\odbcdll" # 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_ODBC @@ -157,23 +157,23 @@ 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_adv.lib ..\lib\vc_mswddll\wxmsw25d_core.lib ..\lib\vc_mswddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxmsw250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxmsw25d_odbc.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_adv.lib ..\lib\vc_mswddll\wxmsw25d_core.lib ..\lib\vc_mswddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxmsw250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxmsw25d_odbc.lib" /debug +# 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\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxbase25d_odbc.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\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswddll" /implib:"..\lib\vc_mswddll\wxbase25d_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\odbcdll" # 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_odbcdll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /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_ODBC @@ -182,23 +182,23 @@ 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_adv.lib ..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxmswuniv250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxmswuniv25_odbc.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_adv.lib ..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxmswuniv250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxmswuniv25_odbc.lib" +# 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\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxbase25_odbc.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\wxbase25.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivdll" /implib:"..\lib\vc_mswunivdll\wxbase25_odbc.lib" !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\odbcdll" # 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_ODBC @@ -207,23 +207,23 @@ 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_adv.lib ..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxmswuniv250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxmswuniv25d_odbc.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_adv.lib ..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxmswuniv250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxmswuniv25d_odbc.lib" /debug +# 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\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxbase25d_odbc.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\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswunivddll" /implib:"..\lib\vc_mswunivddll\wxbase25d_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbcdll - 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 Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\odbcdll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\odbcdll" # 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_odbcdll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /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_ODBC @@ -232,8 +232,8 @@ 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_adv.lib ..\lib\vc_mswudll\wxmsw25u_core.lib ..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxmsw250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxmsw25u_odbc.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_adv.lib ..\lib\vc_mswudll\wxmsw25u_core.lib ..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxmsw250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxmsw25u_odbc.lib" +# 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\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxbase25u_odbc.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\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\lib\vc_mswudll" /implib:"..\lib\vc_mswudll\wxbase25u_odbc.lib" !ENDIF @@ -256,10 +256,6 @@ SOURCE=..\include\wx\db.h # End Source File # Begin Source File -SOURCE=..\include\wx\dbgrid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\dbkeyg.h # End Source File # Begin Source File @@ -276,10 +272,6 @@ SOURCE=..\src\common\db.cpp # End Source File # Begin Source File -SOURCE=..\src\common\dbgrid.cpp -# End Source File -# Begin Source File - SOURCE=..\src\common\dbtable.cpp # End Source File # End Group diff --git a/build/wx_odbclib.dsp b/build/wx_odbclib.dsp index c65974ef12..b8bfef7379 100644 --- a/build/wx_odbclib.dsp +++ b/build/wx_odbclib.dsp @@ -38,185 +38,185 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# PROP BASE Output_Dir "..\lib\vc_mswuniv" # PROP BASE Intermediate_Dir "vc_mswuniv\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswuniv\" +# PROP Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxmswuniv25_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxmsw25u_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxmswuniv25d_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxmsw25_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxbase25_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxbase25_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxmsw25ud_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_mswunivu" # PROP BASE Intermediate_Dir "vc_mswunivu\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxmswuniv25u_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_mswunivud" # PROP BASE Intermediate_Dir "vc_mswunivud\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxmswuniv25ud_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud_odbc.lib" !ELSEIF "$(CFG)" == "odbclib - 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 Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\odbclib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\odbclib" # 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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.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_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.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_odbc.lib" -# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxmsw25d_odbc.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d_odbc.lib" +# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d_odbc.lib" !ENDIF @@ -239,10 +239,6 @@ SOURCE=..\include\wx\db.h # End Source File # Begin Source File -SOURCE=..\include\wx\dbgrid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\dbkeyg.h # End Source File # Begin Source File @@ -259,10 +255,6 @@ SOURCE=..\src\common\db.cpp # End Source File # Begin Source File -SOURCE=..\src\common\dbgrid.cpp -# End Source File -# Begin Source File - SOURCE=..\src\common\dbtable.cpp # End Source File # End Group diff --git a/build/wx_wxexpat.dsp b/build/wx_wxexpat.dsp index 77be019888..8b092e2646 100644 --- a/build/wx_wxexpat.dsp +++ b/build/wx_wxexpat.dsp @@ -46,12 +46,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\wxexpat" # PROP Target_Dir "" # 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 @@ -69,12 +69,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxexpat.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -92,12 +92,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\wxexpat" # PROP Target_Dir "" # 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 @@ -115,12 +115,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxexpat.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -138,12 +138,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxexpat.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -161,12 +161,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\wxexpat" # PROP Target_Dir "" # 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 @@ -184,12 +184,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\wxexpat" # PROP Target_Dir "" # 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 @@ -207,12 +207,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 @@ -230,12 +230,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxexpat.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -253,12 +253,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxexpat.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -276,12 +276,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxexpat.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -299,12 +299,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\wxexpat" # PROP Target_Dir "" # 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 @@ -322,12 +322,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\wxexpat" # PROP Target_Dir "" # 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 @@ -345,12 +345,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\wxexpat" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\wxexpat" # PROP Target_Dir "" # 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 @@ -368,12 +368,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxexpat.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c @@ -391,12 +391,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxexpat" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxexpat.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c diff --git a/build/wx_wxjpeg.dsp b/build/wx_wxjpeg.dsp index 8dcc3ef173..63dbb89cd5 100644 --- a/build/wx_wxjpeg.dsp +++ b/build/wx_wxjpeg.dsp @@ -46,12 +46,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\wxjpeg" # PROP Target_Dir "" # 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 @@ -69,12 +69,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /c @@ -92,12 +92,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg" # PROP Target_Dir "" # 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 @@ -115,12 +115,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /c @@ -138,12 +138,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /c @@ -161,12 +161,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\wxjpeg" # PROP Target_Dir "" # 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 @@ -184,12 +184,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\wxjpeg" # PROP Target_Dir "" # 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 @@ -207,12 +207,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 @@ -230,12 +230,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /c @@ -253,12 +253,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /c @@ -276,12 +276,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /c @@ -299,12 +299,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\wxjpeg" # PROP Target_Dir "" # 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 @@ -322,12 +322,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\wxjpeg" # PROP Target_Dir "" # 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 @@ -345,12 +345,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\wxjpeg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\wxjpeg" # PROP Target_Dir "" # 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 @@ -368,12 +368,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /c @@ -391,12 +391,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxjpeg" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /c diff --git a/build/wx_wxpng.dsp b/build/wx_wxpng.dsp index 525a3decf2..a0d1e11231 100644 --- a/build/wx_wxpng.dsp +++ b/build/wx_wxpng.dsp @@ -46,12 +46,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\wxpng" # PROP Target_Dir "" # 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 @@ -69,12 +69,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -92,12 +92,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\wxpng" # PROP Target_Dir "" # 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 @@ -115,12 +115,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -138,12 +138,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -161,12 +161,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\wxpng" # PROP Target_Dir "" # 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 @@ -184,12 +184,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\wxpng" # PROP Target_Dir "" # 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 @@ -207,12 +207,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 @@ -230,12 +230,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -253,12 +253,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -276,12 +276,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -299,12 +299,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\wxpng" # PROP Target_Dir "" # 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 @@ -322,12 +322,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\wxpng" # PROP Target_Dir "" # 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 @@ -345,12 +345,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\wxpng" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\wxpng" # PROP Target_Dir "" # 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 @@ -368,12 +368,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c @@ -391,12 +391,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxpng" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxpng.pdb /I "..\src\zlib" /D "WIN32" /D "_LIB" /c diff --git a/build/wx_wxregex.dsp b/build/wx_wxregex.dsp index 7b48aff2b7..ab5d5a3dcd 100644 --- a/build/wx_wxregex.dsp +++ b/build/wx_wxregex.dsp @@ -46,12 +46,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -69,12 +69,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -92,12 +92,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -115,12 +115,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -138,12 +138,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -161,12 +161,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -184,12 +184,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -207,12 +207,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 @@ -230,12 +230,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -253,12 +253,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -276,12 +276,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -299,12 +299,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -322,12 +322,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -345,12 +345,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\wxregex" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -368,12 +368,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /c @@ -391,12 +391,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxregex" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /c diff --git a/build/wx_wxtiff.dsp b/build/wx_wxtiff.dsp index 9db37cce33..1d65355a35 100644 --- a/build/wx_wxtiff.dsp +++ b/build/wx_wxtiff.dsp @@ -46,12 +46,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -69,12 +69,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -92,12 +92,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -115,12 +115,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -138,12 +138,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -161,12 +161,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -184,12 +184,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -207,12 +207,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 @@ -230,12 +230,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -253,12 +253,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -276,12 +276,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -299,12 +299,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -322,12 +322,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -345,12 +345,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\wxtiff" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -368,12 +368,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxtiff.pdb /D "WIN32" /D "_LIB" /c @@ -391,12 +391,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxtiff" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxtiff.pdb /D "WIN32" /D "_LIB" /c diff --git a/build/wx_wxzlib.dsp b/build/wx_wxzlib.dsp index 47fe2b25a6..8a52e16f86 100644 --- a/build/wx_wxzlib.dsp +++ b/build/wx_wxzlib.dsp @@ -46,12 +46,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivud\" +# PROP Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -69,12 +69,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -92,12 +92,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -115,12 +115,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -138,12 +138,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -161,12 +161,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -184,12 +184,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -207,12 +207,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# 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 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 @@ -230,12 +230,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -253,12 +253,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 Output_Dir "..\lib\vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -276,12 +276,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# 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_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -299,12 +299,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# PROP BASE Output_Dir "..\lib\vc_mswunivd" # PROP BASE Intermediate_Dir "vc_mswunivd\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -322,12 +322,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# 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_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -345,12 +345,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\wxzlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c @@ -368,12 +368,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# 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 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxzlib.pdb /D "WIN32" /D "_LIB" /c @@ -391,12 +391,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxzlib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxzlib.pdb /D "WIN32" /D "_LIB" /c diff --git a/build/wx_xmldll.dsp b/build/wx_xmldll.dsp index 0d552919df..315c786b42 100644 --- a/build/wx_xmldll.dsp +++ b/build/wx_xmldll.dsp @@ -39,12 +39,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswuddll" # PROP BASE Intermediate_Dir "vc_mswuddll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswuddll\" +# PROP Output_Dir "..\lib\vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\xmldll" # 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_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 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswdll\" +# PROP BASE Output_Dir "..\lib\vc_mswdll" # PROP BASE Intermediate_Dir "vc_mswdll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswdll\" +# PROP Output_Dir "..\lib\vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\xmldll" # 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_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c @@ -89,12 +89,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivuddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivuddll" # PROP BASE Intermediate_Dir "vc_mswunivuddll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivuddll\" +# PROP Output_Dir "..\lib\vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\xmldll" # 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_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 @@ -114,12 +114,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivudll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivudll" # PROP BASE Intermediate_Dir "vc_mswunivudll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivudll\" +# PROP Output_Dir "..\lib\vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\xmldll" # 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_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c @@ -139,12 +139,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswddll\" +# PROP BASE Output_Dir "..\lib\vc_mswddll" # PROP BASE Intermediate_Dir "vc_mswddll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswddll\" +# PROP Output_Dir "..\lib\vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\xmldll" # 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_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 @@ -164,12 +164,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivdll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivdll" # PROP BASE Intermediate_Dir "vc_mswunivdll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswunivdll\" +# PROP Output_Dir "..\lib\vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\xmldll" # 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_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c @@ -189,12 +189,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivddll\" +# PROP BASE Output_Dir "..\lib\vc_mswunivddll" # PROP BASE Intermediate_Dir "vc_mswunivddll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswunivddll\" +# PROP Output_Dir "..\lib\vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\xmldll" # 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_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 @@ -214,12 +214,12 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswudll\" +# PROP BASE Output_Dir "..\lib\vc_mswudll" # PROP BASE Intermediate_Dir "vc_mswudll\xmldll" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswudll\" +# PROP Output_Dir "..\lib\vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\xmldll" # 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_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c diff --git a/build/wx_xmllib.dsp b/build/wx_xmllib.dsp index dc5819c0cd..67f5b90bda 100644 --- a/build/wx_xmllib.dsp +++ b/build/wx_xmllib.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswuniv\" +# 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 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 "__WXMSW__" /D "__WXUNIVERSAL__" /c @@ -61,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswu\" +# PROP BASE Output_Dir "..\lib\vc_mswu" # PROP BASE Intermediate_Dir "vc_mswu\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_mswu\" +# PROP Output_Dir "..\lib\vc_mswu" # PROP Intermediate_Dir "vc_mswu\xmllib" # 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\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c @@ -84,12 +84,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivd\" +# 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 1 -# PROP Output_Dir "..\lib\vc_mswunivd\" +# PROP Output_Dir "..\lib\vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\xmllib" # 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\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 @@ -107,12 +107,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_msw\" +# PROP BASE Output_Dir "..\lib\vc_msw" # PROP BASE Intermediate_Dir "vc_msw\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\lib\vc_msw\" +# PROP Output_Dir "..\lib\vc_msw" # PROP Intermediate_Dir "vc_msw\xmllib" # 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\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c @@ -130,12 +130,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswud\" +# PROP BASE Output_Dir "..\lib\vc_mswud" # PROP BASE Intermediate_Dir "vc_mswud\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswud\" +# PROP Output_Dir "..\lib\vc_mswud" # PROP Intermediate_Dir "vc_mswud\xmllib" # 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\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 @@ -153,12 +153,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\lib\vc_mswunivu\" +# 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 0 -# PROP Output_Dir "..\lib\vc_mswunivu\" +# PROP Output_Dir "..\lib\vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\xmllib" # 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\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c @@ -176,12 +176,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswunivud\" +# 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 Output_Dir "..\lib\vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\xmllib" # 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\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 @@ -199,12 +199,12 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\lib\vc_mswd\" +# PROP BASE Output_Dir "..\lib\vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd\xmllib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\lib\vc_mswd\" +# PROP Output_Dir "..\lib\vc_mswd" # PROP Intermediate_Dir "vc_mswd\xmllib" # 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\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index 41612cdcac..d13878293c 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -33,7 +33,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray); static const int wxUSE_QUERY = -1; -class WXDLLIMPEXP_ODBC wxDbGridColInfoBase +class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase { public: //Default ctor @@ -60,7 +60,7 @@ public: }; -class WXDLLIMPEXP_ODBC wxDbGridColInfo +class WXDLLIMPEXP_DBGRID wxDbGridColInfo { public: wxDbGridColInfo(int colNo, @@ -98,7 +98,7 @@ public: }; -class WXDLLIMPEXP_ODBC wxDbGridCellAttrProvider : public wxGridCellAttrProvider +class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider { public: wxDbGridCellAttrProvider(); @@ -114,7 +114,7 @@ private: }; -class WXDLLIMPEXP_ODBC wxDbGridTableBase : public wxGridTableBase +class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase { public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, diff --git a/include/wx/defs.h b/include/wx/defs.h index e59c210063..cc0edcaa38 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -401,6 +401,7 @@ typedef int wxWindowID; #define WXMAKINGDLL_CORE #define WXMAKINGDLL_ADV #define WXMAKINGDLL_ODBC + #define WXMAKINGDLL_DBGRID #define WXMAKINGDLL_HTML #define WXMAKINGDLL_XML #endif // WXMAKINGDLL @@ -462,6 +463,17 @@ typedef int wxWindowID; #define WXDLLIMPEXP_DATA_ODBC(type) type #endif +#ifdef WXMAKINGDLL_DBGRID + #define WXDLLIMPEXP_DBGRID WXEXPORT + #define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_DBGRID WXIMPORT + #define WXDLLIMPEXP_DATA_DBGRID(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_DBGRID + #define WXDLLIMPEXP_DATA_DBGRID(type) type +#endif + #ifdef WXMAKINGDLL_HTML #define WXDLLIMPEXP_HTML WXEXPORT #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type -- 2.45.2