remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -86,9 +86,6 @@ USE_STC = 1
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 0
|
||||
|
||||
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
|
||||
USE_ODBC = 0
|
||||
|
||||
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
|
||||
USE_QA = 0
|
||||
|
||||
|
||||
@@ -117,11 +117,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_m_tables.obj &
|
||||
$(OBJS)\monodll_winpars.obj &
|
||||
$(OBJS)\monodll_htmllbox.obj &
|
||||
$(OBJS)\monodll_db.obj &
|
||||
$(OBJS)\monodll_dbtable.obj &
|
||||
$(OBJS)\monodll_debugrpt.obj &
|
||||
$(OBJS)\monodll_dbgrptg.obj &
|
||||
$(OBJS)\monodll_dbgrid.obj &
|
||||
$(OBJS)\monodll_xh_animatctrl.obj &
|
||||
$(OBJS)\monodll_xh_bmp.obj &
|
||||
$(OBJS)\monodll_xh_bmpcbox.obj &
|
||||
@@ -689,11 +686,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_m_tables.obj &
|
||||
$(OBJS)\monolib_winpars.obj &
|
||||
$(OBJS)\monolib_htmllbox.obj &
|
||||
$(OBJS)\monolib_db.obj &
|
||||
$(OBJS)\monolib_dbtable.obj &
|
||||
$(OBJS)\monolib_debugrpt.obj &
|
||||
$(OBJS)\monolib_dbgrptg.obj &
|
||||
$(OBJS)\monolib_dbgrid.obj &
|
||||
$(OBJS)\monolib_xh_animatctrl.obj &
|
||||
$(OBJS)\monolib_xh_bmp.obj &
|
||||
$(OBJS)\monolib_xh_bmpcbox.obj &
|
||||
@@ -2251,54 +2245,6 @@ ____wxmedia_namelib_DEP =
|
||||
!ifeq SHARED 0
|
||||
____wxmedia_namelib_DEP = $(__medialib___depname)
|
||||
!endif
|
||||
__odbcdll___depname =
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 1
|
||||
!ifeq USE_ODBC 1
|
||||
__odbcdll___depname = &
|
||||
$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
__odbclib___depname =
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 0
|
||||
!ifeq USE_ODBC 1
|
||||
__odbclib___depname = &
|
||||
$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
|
||||
!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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
____wxdbgrid_namedll_DEP =
|
||||
!ifeq SHARED 1
|
||||
____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
|
||||
!endif
|
||||
____wxdbgrid_namelib_DEP =
|
||||
!ifeq SHARED 0
|
||||
____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
|
||||
!endif
|
||||
__htmldll___depname =
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 1
|
||||
@@ -2682,7 +2628,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
|
||||
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
|
||||
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
|
||||
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
|
||||
USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
|
||||
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
|
||||
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
|
||||
USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
|
||||
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
|
||||
@@ -3487,54 +3433,6 @@ MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
MEDIALIB_OBJECTS = &
|
||||
$(OBJS)\medialib_dummy.obj &
|
||||
$(OBJS)\medialib_mediactrlcmn.obj
|
||||
ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
|
||||
-wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
|
||||
-i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
|
||||
-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC &
|
||||
/fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
ODBCDLL_OBJECTS = &
|
||||
$(OBJS)\odbcdll_dummy.obj &
|
||||
$(OBJS)\odbcdll_db.obj &
|
||||
$(OBJS)\odbcdll_dbtable.obj
|
||||
ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
|
||||
-wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
|
||||
-i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
|
||||
-i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch &
|
||||
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
ODBCLIB_OBJECTS = &
|
||||
$(OBJS)\odbclib_dummy.obj &
|
||||
$(OBJS)\odbclib_db.obj &
|
||||
$(OBJS)\odbclib_dbtable.obj
|
||||
DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
|
||||
-wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
|
||||
-i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
|
||||
-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID &
|
||||
/fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
DBGRIDDLL_OBJECTS = &
|
||||
$(OBJS)\dbgriddll_dummy.obj &
|
||||
$(OBJS)\dbgriddll_dbgrid.obj
|
||||
DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
|
||||
-wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
|
||||
-i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
|
||||
-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) &
|
||||
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
DBGRIDLIB_OBJECTS = &
|
||||
$(OBJS)\dbgridlib_dummy.obj &
|
||||
$(OBJS)\dbgridlib_dbgrid.obj
|
||||
HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
@@ -3921,7 +3819,7 @@ $(OBJS) :
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
|
||||
all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@@ -3954,12 +3852,6 @@ clean : .SYMBOLIC
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
|
||||
-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll
|
||||
-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
|
||||
-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
@@ -4233,78 +4125,6 @@ wxmedia : .SYMBOLIC $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 1
|
||||
!ifeq USE_ODBC 1
|
||||
$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
|
||||
@%create $(OBJS)\odbcdll.lbc
|
||||
@%append $(OBJS)\odbcdll.lbc option quiet
|
||||
@%append $(OBJS)\odbcdll.lbc name $^@
|
||||
@%append $(OBJS)\odbcdll.lbc option caseexact
|
||||
@%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
|
||||
@for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
|
||||
@%append $(OBJS)\odbcdll.lbc
|
||||
@%append $(OBJS)\odbcdll.lbc system os2v2 dll
|
||||
wlink @$(OBJS)\odbcdll.lbc
|
||||
wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib +$^@
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 0
|
||||
!ifeq USE_ODBC 1
|
||||
$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib : $(ODBCLIB_OBJECTS)
|
||||
@%create $(OBJS)\odbclib.lbc
|
||||
@for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i
|
||||
wlib -q -p4096 -n -b $^@ @$(OBJS)\odbclib.lbc
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 1
|
||||
!ifeq USE_GUI 1
|
||||
!ifeq USE_ODBC 1
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll : $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(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 caseexact
|
||||
@%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3) 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
|
||||
@%append $(OBJS)\dbgriddll.lbc
|
||||
@%append $(OBJS)\dbgriddll.lbc system os2v2 dll
|
||||
wlink @$(OBJS)\dbgriddll.lbc
|
||||
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib +$^@
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 0
|
||||
!ifeq USE_GUI 1
|
||||
!ifeq USE_ODBC 1
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib : $(DBGRIDLIB_OBJECTS)
|
||||
@%create $(OBJS)\dbgridlib.lbc
|
||||
@for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i
|
||||
wlib -q -p4096 -n -b $^@ @$(OBJS)\dbgridlib.lbc
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq USE_GUI 1
|
||||
!ifeq USE_ODBC 1
|
||||
wxdbgrid : .SYMBOLIC $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq MONOLITHIC 0
|
||||
!ifeq SHARED 1
|
||||
!ifeq USE_GUI 1
|
||||
@@ -4636,7 +4456,6 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
|
||||
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
|
||||
@@ -5806,21 +5625,12 @@ $(OBJS)\monodll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp
|
||||
$(OBJS)\monodll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@@ -7764,21 +7574,12 @@ $(OBJS)\monolib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp
|
||||
$(OBJS)\monolib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -12405,36 +12206,6 @@ $(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
|
||||
$(OBJS)\medialib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbcdll_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbcdll_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbclib_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbclib_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgriddll_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgridlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgridlib_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
|
||||
|
||||
|
||||
Reference in New Issue
Block a user