From f2fb7e02e87594cbb3adf9b29d7e78d8220948e1 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Wed, 26 Oct 2011 16:57:55 +0000 Subject: [PATCH] Create a new wxWidgets.gmake file to include from projects using wxWidgets. It always specifies unicode version 2.8. --- src/build/wxWidgets.gmake | 24 ++++++++++++++++++++++++ src/sbbs3/userlist/GNUmakefile | 5 +++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 src/build/wxWidgets.gmake diff --git a/src/build/wxWidgets.gmake b/src/build/wxWidgets.gmake new file mode 100644 index 0000000000..ad2a37c1df --- /dev/null +++ b/src/build/wxWidgets.gmake @@ -0,0 +1,24 @@ +ifndef WX_CONFIG + ifeq ($(shell wx-config --cflags > /dev/null 2>&1 && echo YES),YES) + WX_CONFIG := wx-config + WITH_WX := 1 + else + ifeq ($(shell wxgtk2u-2.8-config --cflags > /dev/null 2>&1 && echo YES),YES) + WX_CONFIG := wx13-config + WITH_WX := 1 + endif + endif +endif + +ifdef WX_CONFIG + ifeq ($(shell $(WX_CONFIG) --version=2.8 --query-version),2.8) + WITH_WX := 1 + endif +endif + +ifdef WITH_WX + WX_CONFFLAGS += --version=2.8 --unicode + ifdef DEBUG + WX_CONFFLAGS += --debug + endif +endif diff --git a/src/sbbs3/userlist/GNUmakefile b/src/sbbs3/userlist/GNUmakefile index f0756964d5..ebcb28ff62 100644 --- a/src/sbbs3/userlist/GNUmakefile +++ b/src/sbbs3/userlist/GNUmakefile @@ -15,13 +15,14 @@ SRC_ROOT = ../.. include $(SRC_ROOT)/build/Common.gmake +include $(SRC_ROOT)/build/wxWidgets.gmake include $(SRC_ROOT)/sbbs3/sbbsdefs.mk include ../Common.make include ../Common.gmake -CFLAGS += $(SBBS_CFLAGS) $(SMBLIB_CFLAGS) $(XPDEV-MT_CFLAGS) `wx-config --unicode --cflags` +CFLAGS += $(SBBS_CFLAGS) $(SMBLIB_CFLAGS) $(XPDEV-MT_CFLAGS) `$(WX_CONFIG) $(WX_CONFFLAGS) --cflags` CXXFLAGS += $(CFLAGS) -LDFLAGS += `wx-config --unicode --libs` $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) $(SBBS_LDFLAGS) +LDFLAGS += `$(WX_CONFIG) $(WX_CONFFLAGS) --libs` $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) $(SBBS_LDFLAGS) $(USERLIST): $(SBBS) $(OBJS) @echo Linking $@ -- GitLab