Fix generation of mconfig.h

davmac314 · Jan 17, 2021 · 72bfad1 · 72bfad1
1 parent 599ff59
commit 72bfad1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/build/Makefile b/build/Makefile
@@ -1,3 +1,6 @@
+-include ../mconfig
+-include version.conf
+
 all: ../mconfig includes/mconfig.h
 
 # Look for a suitable build config file and use it.

diff --git a/build/tools/Makefile b/build/tools/Makefile
@@ -2,5 +2,5 @@ HOSTCXX ?= $(CXX)
 HOSTCXXFLAGS ?= $(CXXFLAGS)
 HOSTLDFLAGS ?= $(LDFLAGS)
 
-mconfig-gen: mconfig-gen.cc ../../mconfig
+mconfig-gen: mconfig-gen.cc
 	$(HOSTCXX) $(HOSTCXXOPTS) -o mconfig-gen mconfig-gen.cc $(HOSTLDFLAGS)