Always link with expat in monolithic build.
Fix linking errors when using wxXML in sttaic monolithic build: in this case we must link with expat but it was listed too early, before wxWidgets libraries using it, in the bakefile-generated makefiles. Now add it to the end of the linker command line too by including -lexpat in EXTRALIBS_FOR_BASE which are appended to the linker arguments. Notice that now -lexpat is linked twice because it is still added by <wx-lib>xml</wx-lib> in bakefiles, even in monolithic build, but I don't know how to avoid it and it is harmless anyhow. Closes #12573. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,7 +60,8 @@ WXRC_OBJECTS = \
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
|
||||
@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
|
||||
@COND_USE_XRC_1@__wxrc___depname = wxrc$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_0@__wxrc___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \
|
||||
|
@@ -68,7 +68,7 @@ LIBTYPE_SUFFIX = dll
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(USE_XRC)" == "1"
|
||||
__wxrc___depname = $(OBJS)\wxrc.exe
|
||||
|
@@ -63,7 +63,7 @@ ifeq ($(MONOLITHIC),0)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),1)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
ifeq ($(USE_XRC),1)
|
||||
__wxrc___depname = $(OBJS)\wxrc.exe
|
||||
|
@@ -89,7 +89,7 @@ LINK_TARGET_CPU = /MACHINE:IA64
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(USE_XRC)" == "1"
|
||||
__wxrc___depname = $(OBJS)\wxrc.exe
|
||||
|
@@ -66,7 +66,7 @@ EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!ifeq MONOLITHIC 1
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
__wxrc___depname =
|
||||
!ifeq USE_XRC 1
|
||||
|
Reference in New Issue
Block a user