duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use $(shell instead of backquotes in the Makefile

Browse source
This commit is contained in:
Clownacy 2019-12-05 15:40:42 +00:00
parent b936e1dc00
commit fdae7f89a5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -65,15 +65,15 @@ ifeq ($(WARNINGS_FATAL), 1)
endif endif
ALL_CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d ALL_CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d
CSE2_CXXFLAGS += `pkg-config sdl2 --cflags` `pkg-config freetype2 --cflags` CSE2_CXXFLAGS += $(shell pkg-config sdl2 --cflags) $(shell pkg-config freetype2 --cflags)
ifeq ($(STATIC), 1) ifeq ($(STATIC), 1)
ALL_LDFLAGS += -static ALL_LDFLAGS += -static
CSE2_LIBS += `pkg-config sdl2 --libs --static` `pkg-config freetype2 --libs --static` -lfreetype CSE2_LIBS += $(shell pkg-config sdl2 --libs --static) $(shell pkg-config freetype2 --libs --static) -lfreetype
DOCONFIG_LIBS += `fltk-config --cxxflags --libs --ldstaticflags` DOCONFIG_LIBS += $(shell fltk-config --cxxflags --libs --ldstaticflags)
else else
CSE2_LIBS += `pkg-config sdl2 --libs` `pkg-config freetype2 --libs` CSE2_LIBS += $(shell pkg-config sdl2 --libs) $(shell pkg-config freetype2 --libs)
DOCONFIG_LIBS += `fltk-config --cxxflags --libs --ldflags` DOCONFIG_LIBS += $(shell fltk-config --cxxflags --libs --ldflags)
endif endif
SOURCES = \ SOURCES = \
@ -226,13 +226,13 @@ endif
ifeq ($(RENDERER), OpenGL3) ifeq ($(RENDERER), OpenGL3)
SOURCES += src/Backends/Rendering/OpenGL3 SOURCES += src/Backends/Rendering/OpenGL3
CSE2_CXXFLAGS += `pkg-config glew --cflags` CSE2_CXXFLAGS += $(shell pkg-config glew --cflags)
ifeq ($(STATIC), 1) ifeq ($(STATIC), 1)
CSE2_CXXFLAGS += -DGLEW_STATIC CSE2_CXXFLAGS += -DGLEW_STATIC
CSE2_LIBS += `pkg-config glew --libs --static` CSE2_LIBS += $(shell pkg-config glew --libs --static)
else else
CSE2_LIBS += `pkg-config glew --libs` CSE2_LIBS += $(shell pkg-config glew --libs)
endif endif
ifeq ($(WINDOWS), 1) ifeq ($(WINDOWS), 1)