diff options
| -rw-r--r-- | src/Main/Main.make | 4 | ||||
| -rw-r--r-- | src/Makefile | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index 26d3bb31..67acf18c 100644 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -77,12 +77,16 @@ CXXFLAGS += -I$(BASE_DIR)/Main #------ wxWidgets configuration ------ ifdef TC_NO_GUI +ifdef VC_WX_STATIC WX_CONFIG_LIBS := base else WX_CONFIG_LIBS := adv,core,base endif +else +WX_CONFIG_LIBS := adv,core,base +endif ifeq "$(TC_BUILD_CONFIG)" "Release" CXXFLAGS += $(shell $(WX_CONFIG) $(WX_CONFIG_ARGS) --cxxflags) diff --git a/src/Makefile b/src/Makefile index 8fe166f0..daaf37a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -79,8 +79,9 @@ ifneq "$(origin VERBOSE)" "command line" MAKEFLAGS += -s endif ifeq "$(origin WXSTATIC)" "command line" + export VC_WX_STATIC := 1 WX_CONFIG = $(WX_BUILD_DIR)/wx-config WX_CONFIG_ARGS += --static endif |