diff --git a/Makefile b/Makefile index 120bc81..56bb110 100644 --- a/Makefile +++ b/Makefile @@ -43,13 +43,14 @@ GTEST_CXXFLAGS=-std=$(CPPSTD) -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -g -O GTEST_LDFLAGS=-lsqlite3 -g -O0 -lpthread -lcrypto -lstdc++fs GTEST_OBJECTS=$(filter-out qswiki.o, $(WIKIOBJECTS)) -RESOURCEDIR := template/quitesimple +RESOURCEDIR ?= template/quitesimple RESOURCEFILES := $(shell find $(RESOURCEDIR) -type f) RESOURCEOUTDIR := $(BUILDDIR)/resources RESOURCEOBJECTS := $(patsubst $(RESOURCEDIR)/%,$(RESOURCEOUTDIR)/%.o,$(RESOURCEFILES)) GENERATED_PATH = $(BUILDDIR)/generated + OBJCOPY_ARCH := elf64-x86-64 OBJCOPY_TARGET := i386:x86-64 @@ -96,7 +97,7 @@ clean: rm -r build genresources: resources_gen.sh - ./resources_gen.sh $(GENERATED_PATH) + ./resources_gen.sh $(GENERATED_PATH) $(RESOURCEDIR) $(RESOURCEOUTDIR)/%.o: $(RESOURCEDIR)/% @mkdir -p $(dir $@)