Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxrc independent from GUI support

Browse Source 
The wxrc program does not depend on the GUI libraries, but only on
the base and XML libraries, so make it possible to build it in non-GUI
builds too.

Closes https://github.com/wxWidgets/wxWidgets/pull/2419
This commit is contained in:
Arrigo Marchiori
2021-07-07 09:55:12 +02:00
committed by Vadim Zeitlin
parent aaa2dabf5d
commit 30915c6163
35 changed files with 331 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/msw/makefile.gcc
View File

@@ -20,10 +20,10 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
UNICODE="$(UNICODE)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
DEBUG_FLAG="$(DEBUG_FLAG)" MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" \
USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" \
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_MEDIA="$(USE_MEDIA)" USE_XML="$(USE_XML)" USE_XRC="$(USE_XRC)" \
USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \
USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_DPI_AWARE_MANIFEST="$(USE_DPI_AWARE_MANIFEST)" \
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
@@ -4910,16 +4910,20 @@ ____wxqa_namelib_DEP = $(__qalib___depname)
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_XML),1)
__xmldll___depname = \
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
ifeq ($(USE_XML),1)
__xmllib___depname = \
$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
endif
endif
endif
ifeq ($(SHARED),1)
____wxxml_namedll_DEP = $(__xmldll___depname)
endif
@@ -4928,12 +4932,14 @@ ____wxxml_namelib_DEP = $(__xmllib___depname)
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_XML),1)
ifeq ($(USE_XRC),1)
__xrcdll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
ifeq ($(USE_XRC),1)
@@ -5017,11 +5023,13 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_RICHTEXT),1)
ifeq ($(USE_XML),1)
__richtextdll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
ifeq ($(USE_RICHTEXT),1)
@@ -5654,6 +5662,7 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_XML),1)
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname)
$(foreach f,$(subst \,/,$(XMLDLL_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
@@ -5661,9 +5670,11 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@-del $@.rsp
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
ifeq ($(USE_XML),1)
$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a: $(XMLLIB_OBJECTS)
$(foreach f,$(subst \,/,$(XMLLIB_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
@@ -5673,13 +5684,17 @@ $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB
ranlib $@
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(USE_XML),1)
wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_XML),1)
ifeq ($(USE_XRC),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
$(foreach f,$(subst \,/,$(XRCDLL_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@@ -5689,6 +5704,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
@@ -5809,6 +5825,7 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_RICHTEXT),1)
ifeq ($(USE_XML),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(OBJS)\richtextdll_version_rc.o $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
$(foreach f,$(subst \,/,$(RICHTEXTDLL_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
@@ -5817,6 +5834,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
@@ -5954,6 +5972,7 @@ build_cfg_file: $(SETUPHDIR)
@echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
@echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
@echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
@echo USE_XML=$(USE_XML) >>$(BUILD_CFG_FILE)
@echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
@echo COMPILER=gcc >>$(BUILD_CFG_FILE)
@echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)