Skip to content
Snippets Groups Projects
Commit f2fb7e02 authored by deuce's avatar deuce
Browse files

Create a new wxWidgets.gmake file to include from projects using

wxWidgets.  It always specifies unicode version 2.8.
parent c2689c53
Branches
Tags
No related merge requests found
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
......@@ -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 $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment