Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect the WX_CONFIG_PATH variable

Browse source 
The configure script takes a --with-wx-config argument, we should respect it.
It is very necessary for FreeBSD, which installs wx configs under more specific names such as 'wxgtk2u-3.0-config'.
This commit is contained in:
Greg V 2018-05-18 02:48:43 +03:00
commit d5b7a69ff6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Makefile.am
View file

@ -15,7 +15,7 @@ endif
amrefresh:
# Special wxWidgets files
WINDRES = $(shell wx-config --rescomp)
WINDRES = $(shell $(WX_CONFIG_PATH) --rescomp)
wx.res: wx.rc
$(WINDRES) -i wx.rc --input-format=rc -o wx.res -O coff
@ -53,8 +53,8 @@ resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc resid-fp/wave8580_PS_.cc \
resid-fp/wave8580_PST.cc resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \
resid-fp/wave.cc
pcem_CFLAGS = $(subst -fpermissive,,$(shell wx-config --cxxflags) $(shell sdl2-config --cflags))
pcem_CXXFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
pcem_CFLAGS = $(subst -fpermissive,,$(shell $(WX_CONFIG_PATH) --cxxflags) $(shell sdl2-config --cflags))
pcem_CXXFLAGS = $(shell $(WX_CONFIG_PATH) --cxxflags) $(shell sdl2-config --cflags)
pcem_LDADD = @LIBS@
pcem_SOURCES += wx-main.cc wx-config_sel.c wx-dialogbox.cc wx-utils.cc wx-app.cc \
wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c \