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:
@@ -30,6 +30,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
EXTRALIBS_HTML = @EXTRALIBS_HTML@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
@@ -63,7 +64,8 @@ HELPVIEW_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_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_PLATFORM_MAC_0@__helpview___mac_setfilecmd = @true
|
||||
|
@@ -68,7 +68,7 @@ LIBTYPE_SUFFIX = dll
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__OPTIMIZEFLAG_2 = -Od
|
||||
|
@@ -65,7 +65,7 @@ ifeq ($(MONOLITHIC),0)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),1)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
__OPTIMIZEFLAG_2 = -O0
|
||||
|
@@ -91,7 +91,7 @@ LINK_TARGET_CPU = /MACHINE:IA64
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO_0 = /Zi
|
||||
|
@@ -66,7 +66,7 @@ EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!ifeq MONOLITHIC 1
|
||||
EXTRALIBS_FOR_BASE =
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
__DEBUGINFO_0 =
|
||||
!ifeq BUILD debug
|
||||
|
Reference in New Issue
Block a user