Fix linux make dependencies
This commit is contained in:
parent
bbd20d04ec
commit
76975e93aa
|
@ -1,7 +1,7 @@
|
||||||
project_dir := $(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/../)
|
project_dir := $(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/../)
|
||||||
sources = $(wildcard $(project_dir)/oscar64/*.cpp)
|
sources = $(wildcard $(project_dir)/oscar64/*.cpp)
|
||||||
objects = $(patsubst $(project_dir)/oscar64/%.cpp,%.o,$(sources))
|
|
||||||
srcdir := $(if $(srcdir),$(srcdir),$(project_dir)/build)
|
srcdir := $(if $(srcdir),$(srcdir),$(project_dir)/build)
|
||||||
|
objects = $(patsubst $(project_dir)/oscar64/%.cpp,$(srcdir)/%.o,$(sources))
|
||||||
|
|
||||||
CXX = c++
|
CXX = c++
|
||||||
CPPFLAGS = -g -O2 -std=c++11 -Wno-switch
|
CPPFLAGS = -g -O2 -std=c++11 -Wno-switch
|
||||||
|
@ -41,23 +41,24 @@ endif
|
||||||
all: --prep-build-dir compiler samples tests
|
all: --prep-build-dir compiler samples tests
|
||||||
|
|
||||||
|
|
||||||
%.o: $(project_dir)/oscar64/%.cpp
|
$(srcdir)/%.o: $(project_dir)/oscar64/%.cpp
|
||||||
@echo "Compiling compiler file" $@ "..."
|
@echo "Compiling compiler file" $@ "..." $<
|
||||||
@$(CXX) -c $(CPPFLAGS) $< -o $(srcdir)/$@
|
@$(CXX) -c $(CPPFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
%.d: $(project_dir)/oscar64/%.cpp
|
$(srcdir)/%.d: $(project_dir)/oscar64/%.cpp
|
||||||
@echo "Transforming file" $@ "..."
|
@$(MKDIR_PARENT) $(srcdir)
|
||||||
|
@echo "Transforming file" $@ "..." $<
|
||||||
@set -e; \
|
@set -e; \
|
||||||
$(RM) $(srcdir)/$@; \
|
$(RM) $@; \
|
||||||
@$(CC) -MM $(CPPFLAGS) $< > $(srcdir)/$@.$$$$; \
|
$(CC) -MM -MT $(patsubst %.d,%.o,$@) $(CPPFLAGS) $< > $@.$$$$; \
|
||||||
$(SED) 's,\($*\)\.o[ :]*,\1.o $(srcdir)/$@ : ,g' < $(srcdir)/$@.$$$$ > $(srcdir)/$@; \
|
$(SED) 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
|
||||||
$(RM) $(srcdir)/$@.$$$$
|
$(RM) $@.$$$$
|
||||||
|
|
||||||
|
|
||||||
compiler: $(objects)
|
compiler: $(objects)
|
||||||
|
@$(MKDIR_PARENT) $(srcdir)
|
||||||
@echo "Linking compiler..."
|
@echo "Linking compiler..."
|
||||||
@cd $(srcdir); \
|
|
||||||
$(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o $(project_dir)/bin/oscar64
|
$(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o $(project_dir)/bin/oscar64
|
||||||
|
|
||||||
|
|
||||||
|
@ -114,11 +115,12 @@ ifeq ($(UNAME_S), Darwin)
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
include $($(srcdir)/objects:.o=.d)
|
include $(objects:.o=.d)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
--prep-build-dir:
|
--prep-build-dir:
|
||||||
|
echo "makedir"
|
||||||
@if [ ! -d $(srcdir) ]; then $(MKDIR_PARENT) $(srcdir); fi
|
@if [ ! -d $(srcdir) ]; then $(MKDIR_PARENT) $(srcdir); fi
|
||||||
@if [ ! -d $(project_dir)/bin ]; then $(MKDIR_PARENT) $(project_dir)/bin; fi
|
@if [ ! -d $(project_dir)/bin ]; then $(MKDIR_PARENT) $(project_dir)/bin; fi
|
||||||
|
|
Loading…
Reference in New Issue