Fixed some static-related stupidity in the Makefile
This commit is contained in:
parent
001457fac8
commit
063bfbc71c
1 changed files with 4 additions and 2 deletions
6
Makefile
6
Makefile
|
@ -35,14 +35,16 @@ ifeq ($(WINDOWS), 1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CXXFLAGS += -std=c++98 `sdl2-config --cflags` `pkg-config freetype2 --cflags` -MMD -MP -MF $@.d
|
CXXFLAGS += -std=c++98 `sdl2-config --cflags` `pkg-config freetype2 --cflags` -MMD -MP -MF $@.d
|
||||||
LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs`
|
LIBS += `pkg-config freetype2 --libs`
|
||||||
|
|
||||||
ifeq ($(STATIC), 1)
|
ifeq ($(STATIC), 1)
|
||||||
CXXFLAGS += -static
|
CXXFLAGS += `sdl2-config --static-libs` -static
|
||||||
LIBS += -lharfbuzz -lfreetype -lbz2 -lpng -lz -lgraphite2
|
LIBS += -lharfbuzz -lfreetype -lbz2 -lpng -lz -lgraphite2
|
||||||
ifeq ($(WINDOWS), 1)
|
ifeq ($(WINDOWS), 1)
|
||||||
LIBS += -lRpcrt4 -lDwrite -lusp10
|
LIBS += -lRpcrt4 -lDwrite -lusp10
|
||||||
endif
|
endif
|
||||||
|
else
|
||||||
|
CXXFLAGS += `sdl2-config --libs`
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# For an accurate result to the original's code, compile in alphabetical order
|
# For an accurate result to the original's code, compile in alphabetical order
|
||||||
|
|
Loading…
Add table
Reference in a new issue