grid/dbgrid was not getting built for inclusion with this project

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

diff --git a/samples/db/db.bkl b/samples/db/db.bkl
index e50d84256e1723292a983cfda7c2d8260f8713c3..6b07cf32350c1fe5cb55067f666fe1e02e1fecec 100644 (file)
--- a/samples/db/db.bkl
+++ b/samples/db/db.bkl
@@ -7,6 +7,7 @@
          cond="USE_ODBC=='1'"
          template="wx_sample" template_append="wx_append">
         <sources>dbtest.cpp listdb.cpp</sources>
+        <wx-lib>dbgrid</wx-lib>
         <wx-lib>odbc</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc
index 91aa7b63d26e267a5e1834f5964526ecb15f91fd..ec7ea115b8adcc4f23188d374959893ce9bb5a11 100644 (file)
--- a/samples/db/makefile.vc
+++ b/samples/db/makefile.vc
@@ -206,6 +206,14 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_DBGRID_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
 __WXLIB_ODBC_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
 !endif
@@ -258,7 +266,7 @@ clean:
 !if "$(USE_ODBC)" == "1"
 $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-       $(DBTEST_OBJECTS)  $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
+       $(DBTEST_OBJECTS)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
 <<
 !endif