From 98221326bcbd9fc3be3c1d2eecf07842d26fad50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 2 Aug 2004 08:59:59 +0000 Subject: [PATCH] Regenerated makefile after some recent addition of library. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/db/makefile.wat | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat index 47d002525a..0c5fcef9ce 100644 --- a/samples/db/makefile.wat +++ b/samples/db/makefile.wat @@ -125,6 +125,11 @@ __WXLIB_ODBC_p = __WXLIB_ODBC_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib !endif !endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -218,7 +223,7 @@ $(OBJS)\dbtest.exe : $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res @%append $(OBJS)\dbtest.lbc option caseexact @%append $(OBJS)\dbtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(DBTEST_OBJECTS)) do @%append $(OBJS)\dbtest.lbc file %i - @for %i in ( $(__WXLIB_DBGRID_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 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)\dbtest.lbc library %i + @for %i in ( $(__WXLIB_DBGRID_p) $(__WXLIB_ODBC_p) $(__WXLIB_ADV_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 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)\dbtest.lbc library %i @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res wlink @$(OBJS)\dbtest.lbc !endif -- 2.50.0