removed odbc from the libraries used by the console sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-26 00:08:21 +00:00
parent efb8d6305f
commit 70fd78f30e
8 changed files with 38 additions and 66 deletions

View File

@@ -180,13 +180,6 @@ __WXLIB_NET_p =
__WXLIB_NET_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif
__WXLIB_ODBC_p =
!ifeq MONOLITHIC 0
!ifeq USE_ODBC 1
__WXLIB_ODBC_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
!endif
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = &
@@ -244,7 +237,7 @@ $(OBJS)\console.exe : $(CONSOLE_OBJECTS)
@%append $(OBJS)\console.lbc option caseexact
@%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_'
@for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i
@for %i in ( $(__WXLIB_NET_p) $(__WXLIB_ODBC_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_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 odbc32.lib) do @%append $(OBJS)\console.lbc library %i
@for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_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) do @%append $(OBJS)\console.lbc library %i
@%append $(OBJS)\console.lbc
@for %i in () do @%append $(OBJS)\console.lbc option stack=%i
wlink @$(OBJS)\console.lbc