Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2004-05-18 02:40:04 +00:00
parent 2cb4351487
commit df16c649d2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/db/db.bkl
View File

@@ -7,6 +7,7 @@
cond="USE_ODBC=='1'" cond="USE_ODBC=='1'"
template="wx_sample" template_append="wx_append"> template="wx_sample" template_append="wx_append">
<sources>dbtest.cpp listdb.cpp</sources> <sources>dbtest.cpp listdb.cpp</sources>
<wx-lib>dbgrid</wx-lib>
<wx-lib>odbc</wx-lib> <wx-lib>odbc</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>

10
samples/db/makefile.vc
View File

@@ -206,6 +206,14 @@ __DLLFLAG_p = /DWXUSINGDLL
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
__DLLFLAG_p_1 = /d WXUSINGDLL __DLLFLAG_p_1 = /d WXUSINGDLL
!endif !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" !if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
__WXLIB_ODBC_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib __WXLIB_ODBC_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
!endif !endif
@@ -258,7 +266,7 @@ clean:
!if "$(USE_ODBC)" == "1" !if "$(USE_ODBC)" == "1"
$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< 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 !endif