aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Germain <benoit.germain@ubisoft.com>2024-10-28 18:21:21 +0100
committerBenoit Germain <benoit.germain@ubisoft.com>2024-10-28 18:21:21 +0100
commit3d2ee2a988cf59371945eedd3238c55f3452170a (patch)
tree0778ca3d03d615297a15d99585763c0b4617e663
parent69c6796fb1356d78be8fefa93a80b30295b6bb54 (diff)
downloadlanes-3d2ee2a988cf59371945eedd3238c55f3452170a.tar.gz
lanes-3d2ee2a988cf59371945eedd3238c55f3452170a.tar.bz2
lanes-3d2ee2a988cf59371945eedd3238c55f3452170a.zip
Fix Makefiles following header renames
-rw-r--r--Makefile2
-rw-r--r--src/Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8b06e56..d7c4d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ _PREFIX=LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
42#--- 42#---
43all: $(_TARGET_SO) 43all: $(_TARGET_SO)
44 44
45$(_TARGET_SO): src/*.lua src/*.cpp src/*.h 45$(_TARGET_SO): src/*.lua src/*.cpp src/*.h src/*.hpp
46 cd src && $(MAKE) LUA=$(LUA) 46 cd src && $(MAKE) LUA=$(LUA)
47 47
48clean: 48clean:
diff --git a/src/Makefile b/src/Makefile
index 60b6108..5fc3482 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,10 +125,10 @@ MODULE_DIR=$(MODULE)
125#--- 125#---
126all: $(MODULE)/core.$(_SO) 126all: $(MODULE)/core.$(_SO)
127 127
128_pch.h.gch: _pch.h 128_pch.hpp.gch: _pch.hpp
129 $(CC) $(CFLAGS) -x c++-header _pch.h -o _pch.h.gch 129 $(CC) $(CFLAGS) -x c++-header _pch.hpp -o _pch.hpp.gch
130 130
131%.o: %.cpp _pch.h.gch *.h *.hpp Makefile 131%.o: %.cpp _pch.hpp.gch *.h *.hpp Makefile
132 $(CC) $(CFLAGS) -c $< 132 $(CC) $(CFLAGS) -c $<
133 133
134# Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think) 134# Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)