added wxDbGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -246,6 +246,22 @@ CORELIB_OBJECTS = \
|
||||
$(OBJS)\corelib_mslu.o \
|
||||
$(OBJS)\corelib_volume.o \
|
||||
$(____CORE_SRC_FILENAMES_3_OBJECTS)
|
||||
DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
|
||||
-I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(CXXFLAGS)
|
||||
DBGRIDDLL_OBJECTS = \
|
||||
$(OBJS)\dbgriddll_dummy.o \
|
||||
$(OBJS)\dbgriddll_dbgrid.o
|
||||
DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
|
||||
-I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
|
||||
$(CXXFLAGS)
|
||||
DBGRIDLIB_OBJECTS = \
|
||||
$(OBJS)\dbgridlib_dummy.o \
|
||||
$(OBJS)\dbgridlib_dbgrid.o
|
||||
GLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
|
||||
@@ -568,7 +584,6 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
ODBCDLL_OBJECTS = \
|
||||
$(OBJS)\odbcdll_dummy.o \
|
||||
$(OBJS)\odbcdll_db.o \
|
||||
$(OBJS)\odbcdll_dbgrid.o \
|
||||
$(OBJS)\odbcdll_dbtable.o
|
||||
ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
@@ -578,7 +593,6 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
ODBCLIB_OBJECTS = \
|
||||
$(OBJS)\odbclib_dummy.o \
|
||||
$(OBJS)\odbclib_db.o \
|
||||
$(OBJS)\odbclib_dbgrid.o \
|
||||
$(OBJS)\odbclib_dbtable.o
|
||||
WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)
|
||||
@@ -2391,8 +2405,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_winpars.o \
|
||||
$(OBJS)\monolib_htmllbox.o \
|
||||
$(OBJS)\monolib_db.o \
|
||||
$(OBJS)\monolib_dbgrid.o \
|
||||
$(OBJS)\monolib_dbtable.o
|
||||
$(OBJS)\monolib_dbtable.o \
|
||||
$(OBJS)\monolib_dbgrid.o
|
||||
endif
|
||||
ifeq ($(USE_GUI),1)
|
||||
____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
|
||||
@@ -2435,8 +2449,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_winpars.o \
|
||||
$(OBJS)\monodll_htmllbox.o \
|
||||
$(OBJS)\monodll_db.o \
|
||||
$(OBJS)\monodll_dbgrid.o \
|
||||
$(OBJS)\monodll_dbtable.o
|
||||
$(OBJS)\monodll_dbtable.o \
|
||||
$(OBJS)\monodll_dbgrid.o
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),1)
|
||||
@@ -2482,6 +2496,26 @@ __corelib___depname = \
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),1)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
__dbgriddll___depname = \
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
__dbgridlib___depname = \
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_OPENGL),1)
|
||||
@@ -2543,7 +2577,7 @@ ifeq ($(SHARED),1)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
__odbcdll___depname = \
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll
|
||||
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -2553,7 +2587,7 @@ ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
__odbclib___depname = \
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -2587,7 +2621,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: setup_h $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
|
||||
all: setup_h $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
|
||||
|
||||
$(OBJS)\advdll_calctrl.o: ..\src\generic\calctrl.cpp
|
||||
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
@@ -5505,6 +5539,18 @@ $(OBJS)\corelib_xpmdecod.o: ..\src\common\xpmdecod.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
|
||||
endif
|
||||
|
||||
$(OBJS)\dbgriddll_dbgrid.o: ..\src\common\dbgrid.cpp
|
||||
$(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgriddll_dummy.o: ..\src\msw\dummy.cpp
|
||||
$(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgridlib_dbgrid.o: ..\src\common\dbgrid.cpp
|
||||
$(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\dbgridlib_dummy.o: ..\src\msw\dummy.cpp
|
||||
$(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\gldll_dummy.o: ..\src\msw\dummy.cpp
|
||||
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -8826,9 +8872,6 @@ $(OBJS)\netlib_url.o: ..\src\common\url.cpp
|
||||
$(OBJS)\odbcdll_db.o: ..\src\common\db.cpp
|
||||
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbcdll_dbgrid.o: ..\src\common\dbgrid.cpp
|
||||
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbcdll_dbtable.o: ..\src\common\dbtable.cpp
|
||||
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -8838,9 +8881,6 @@ $(OBJS)\odbcdll_dummy.o: ..\src\msw\dummy.cpp
|
||||
$(OBJS)\odbclib_db.o: ..\src\common\db.cpp
|
||||
$(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbclib_dbgrid.o: ..\src\common\dbgrid.cpp
|
||||
$(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\odbclib_dbtable.o: ..\src\common\dbtable.cpp
|
||||
$(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -9269,9 +9309,12 @@ clean:
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
|
||||
-if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
|
||||
-if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a
|
||||
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a
|
||||
@@ -9302,6 +9345,30 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),1)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
|
||||
$(CXX) -shared -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS)
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(DBGRIDLIB_OBJECTS)
|
||||
ranlib $@
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),1)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_OPENGL),1)
|
||||
@@ -9387,8 +9454,8 @@ ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),1)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
|
||||
$(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
|
||||
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
|
||||
$(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -9398,7 +9465,7 @@ ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS)
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(ODBCLIB_OBJECTS)
|
||||
ranlib $@
|
||||
|
Reference in New Issue
Block a user