aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Belle-Isle <drumsetmonkey@gmail.com>2019-08-31 16:09:41 -0400
committerAndy Belle-Isle <drumsetmonkey@gmail.com>2019-08-31 16:09:41 -0400
commite0498738ea274d60ece3756697ac51602ab087d1 (patch)
tree9b644e557bb508e0baedb7e5d6a94ce5ab4ab77e
parent87f08aaec01c3137637bbcd07bace30e8dd8fd90 (diff)
parenta00d046f4b5dcccab60228c78ac5291ab9b9f3d8 (diff)
Merge branch 'master' of https://github.com/tcsullivan/gamedev2
-rw-r--r--Makefile9
-rw-r--r--src/script.cpp3
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 42c030a..ce5b043 100644
--- a/Makefile
+++ b/Makefile
@@ -54,22 +54,25 @@ all: resources $(EXEC)
resources: directories
-directories:
+directories:
@mkdir -p $(EXECDIR)
@mkdir -p $(OUTDIR)
clean:
+ @echo " CLEAN"
@$(RM) -rf $(OUTDIR)
cleaner: clean
@$(RM) -rf $(EXECDIR)
$(EXEC): $(CXXOBJ)
- $(CXX) -o $(EXECDIR)/$(EXEC) $^ $(LIBS)
+ @echo " CXX " $(EXEC)
+ @$(CXX) -o $(EXECDIR)/$(EXEC) $^ $(LIBS)
$(OUTDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT)
+ @echo " CXX " $<
@mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) $(CXXINCS) -c -o $@ $<
+ @$(CXX) $(CXXFLAGS) $(CXXINCS) -c -o $@ $<
@$(CXX) $(CXXFLAGS) $(INCDEP) -MM $(SRCDIR)/$*.$(SRCEXT) > $(OUTDIR)/$*.$(DEPEXT)
@cp -f $(OUTDIR)/$*.$(DEPEXT) $(OUTDIR)/$*.$(DEPEXT).tmp
@sed -e 's|.*:|$(OUTDIR)/$*.$(OBJEXT):|' < $(OUTDIR)/$*.$(DEPEXT).tmp > $(OUTDIR)/$*.$(DEPEXT)
diff --git a/src/script.cpp b/src/script.cpp
index ec82513..89ae9e0 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -43,9 +43,8 @@ void ScriptSystem::update([[maybe_unused]] entityx::EntityManager& entites,
}
-void ScriptSystem::receive(const EntitySpawnEvent &toSpawn)
+void ScriptSystem::receive([[maybe_unused]] const EntitySpawnEvent &toSpawn)
{
- (void)toSpawn;
}
/*********************