Will not compile with SDL for p7
This commit is contained in:
parent
7c1dbd6e59
commit
0c1507f5ec
2
Makefile
2
Makefile
|
@ -148,7 +148,7 @@ $(eval $(call make-binaryobj-rule,$(bin),$(obj)))))
|
|||
# Make a binary
|
||||
define make-binary-rules
|
||||
$1$(if $(FOR_WINDOWS),.exe): $(SRC_$1:%=$(OBJDIR)/$1/%.o) | $(OBJDIR)/$1
|
||||
$(call bcmd,ld,$$@,$(LD) -o $$@ $$^ $(LDFLAGS))
|
||||
$(call bcmd,ld,$$@,$(LD) -o $$@ $$^ $(LDFLAGS) $(LDFLAGSb_$1))
|
||||
all-$1: $1$(if $(FOR_WINDOWS),.exe)
|
||||
|
||||
clean-$1:
|
||||
|
|
|
@ -14,9 +14,6 @@
|
|||
# Project name.
|
||||
NAME := p7utils
|
||||
|
||||
# Required packages
|
||||
LIBS := libp7 sdl
|
||||
|
||||
# Author information.
|
||||
MAINTAINER_NAME := Thomas \"Cakeisalie5\" Touhey
|
||||
MAINTAINER_MAIL := thomas@touhey.fr
|
||||
|
@ -64,15 +61,17 @@
|
|||
-D MAINTAINER="$(MAINTAINER_NAME) <$(MAINTAINER_MAIL)>" \
|
||||
-D DEFAULT_STORAGE="$(DEFAULT_STORAGE)" \
|
||||
-D DEFAULT_ZOOM="$(DEFAULT_ZOOM)" \
|
||||
$(shell $(PKGCONFIG) --cflags $(LIBS) 2>/dev/null) \
|
||||
$(shell $(PKGCONFIG) --cflags libp7 sdl 2>/dev/null) \
|
||||
$(CMOREFLAGS)
|
||||
|
||||
# Linker
|
||||
LD := $(TARGET)gcc
|
||||
# - Specific linker flags
|
||||
LDFLAGS_Linux := -Wl,-z,relro
|
||||
# - Binary specific linker flags
|
||||
LDFLAGSb_p7screen := $(shell $(PKGCONFIG) --libs sdl 2>/dev/null)
|
||||
# - Linker flags
|
||||
LDFLAGS := $(shell $(PKGCONFIG) --libs $(LIBS) 2>/dev/null) \
|
||||
LDFLAGS := $(shell $(PKGCONFIG) --libs libp7 2>/dev/null) \
|
||||
$(if $(FOR_WINDOWS),,$(LDFLAGS_Linux))
|
||||
|
||||
# Raw ELF object maker
|
||||
|
|
Reference in New Issue