static libs depend on 3rd party ones now, too (for convenience)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9262,7 +9262,7 @@ endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(ADVLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9279,7 +9279,7 @@ endif
|
||||
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(BASELIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9337,7 +9337,7 @@ endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(CORELIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9360,7 +9360,7 @@ 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)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(DBGRIDLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9381,7 +9381,7 @@ endif
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_OPENGL),1)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(GLLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9401,7 +9401,7 @@ endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_HTML),1)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(HTMLLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9424,7 +9424,7 @@ endif
|
||||
|
||||
ifeq ($(MONOLITHIC),1)
|
||||
ifeq ($(SHARED),0)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(MONOLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9443,7 +9443,7 @@ endif
|
||||
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(NETLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9465,7 +9465,7 @@ ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(USE_ODBC),1)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(ODBCLIB_OBJECTS)
|
||||
ranlib $@
|
||||
@@ -9524,7 +9524,7 @@ endif
|
||||
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS)
|
||||
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
|
||||
if exist $@ del $@
|
||||
ar rcu $@ $(XMLLIB_OBJECTS)
|
||||
ranlib $@
|
||||
|
Reference in New Issue
Block a user