aboutsummaryrefslogtreecommitdiffstats
path: root/entityx
diff options
context:
space:
mode:
Diffstat (limited to 'entityx')
-rw-r--r--entityx/3rdparty/simplesignal.h4
-rw-r--r--entityx/Makefile1
2 files changed, 3 insertions, 2 deletions
diff --git a/entityx/3rdparty/simplesignal.h b/entityx/3rdparty/simplesignal.h
index 3c60273..864c1c6 100644
--- a/entityx/3rdparty/simplesignal.h
+++ b/entityx/3rdparty/simplesignal.h
@@ -26,9 +26,9 @@ template <typename Result>
struct CollectorLast {
typedef Result CollectorResult;
explicit CollectorLast() : last_() {}
- inline bool operator()(Result r) {
+ inline CollectorResult operator()(Result r) {
last_ = r;
- return true;
+ return last_;
}
CollectorResult result() { return last_; }
diff --git a/entityx/Makefile b/entityx/Makefile
index 58b18a7..d5c748f 100644
--- a/entityx/Makefile
+++ b/entityx/Makefile
@@ -9,6 +9,7 @@ FILES = help/Pool.cc \
Entity.cc \
System.cc
all:
+ mkdir out
g++ $(INC) $(FLG) -c help/Pool.cc -o out/Pool.o
g++ $(INC) $(FLG) -c help/Timer.cc -o out/Timer.o
g++ $(INC) $(FLG) -c Event.cc -o out/Event.o