aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Germain <benoit.germain@ubisoft.com>2025-04-14 16:21:45 +0200
committerBenoit Germain <benoit.germain@ubisoft.com>2025-04-14 16:21:45 +0200
commit9cc30ff72ba25ceb3a1fdef0d8c4a6efc910d777 (patch)
treef85898396b39932e750d5a0352d755fa7c6b9745
parent92a8e79802c039af2da97e50f0b9ed5ca5e2023c (diff)
downloadlanes-9cc30ff72ba25ceb3a1fdef0d8c4a6efc910d777.tar.gz
lanes-9cc30ff72ba25ceb3a1fdef0d8c4a6efc910d777.tar.bz2
lanes-9cc30ff72ba25ceb3a1fdef0d8c4a6efc910d777.zip
Makefile tweaks
Diffstat (limited to '')
-rw-r--r--Makefile6
-rw-r--r--Shared.makefile2
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5b5d27a..2d7694c 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ run_unit_tests: build_lanes build_unit_tests build_DUE
85debug_unit_tests: build_lanes build_unit_tests build_DUE 85debug_unit_tests: build_lanes build_unit_tests build_DUE
86 @echo ========================================================================================= 86 @echo =========================================================================================
87 $(_PREFIX) $(_UNITTEST_TARGET) --list-tests 87 $(_PREFIX) $(_UNITTEST_TARGET) --list-tests
88 $(_PREFIX) gdb --args $(_UNITTEST_TARGET) --rng-seed 0 -s "lanes.configure.nb_user_keepers" 88 $(_PREFIX) gdb --args $(_UNITTEST_TARGET) --list-tests --rng-seed 0 -s "scripted_tests.legacy.basic"
89 89
90clean: 90clean:
91 cd src && $(MAKE) -f Lanes.makefile clean 91 cd src && $(MAKE) -f Lanes.makefile clean
@@ -273,13 +273,11 @@ DESTDIR:=/usr/local
273LUA_LIBDIR:=$(DESTDIR)/lib/lua/$(LUA_VERSION) 273LUA_LIBDIR:=$(DESTDIR)/lib/lua/$(LUA_VERSION)
274LUA_SHAREDIR:=$(DESTDIR)/share/lua/$(LUA_VERSION) 274LUA_SHAREDIR:=$(DESTDIR)/share/lua/$(LUA_VERSION)
275 275
276#
277# AKa 17-Oct: changed to use 'install -m 644' and 'cp -p'
278#
279install: $(_LANES_TARGET) src/lanes.lua 276install: $(_LANES_TARGET) src/lanes.lua
280 mkdir -p $(LUA_LIBDIR) $(LUA_SHAREDIR) 277 mkdir -p $(LUA_LIBDIR) $(LUA_SHAREDIR)
281 install -m 644 $(_LANES_TARGET) $(LUA_LIBDIR) 278 install -m 644 $(_LANES_TARGET) $(LUA_LIBDIR)
282 cp -p src/lanes.lua $(LUA_SHAREDIR) 279 cp -p src/lanes.lua $(LUA_SHAREDIR)
280 install -m 644 $(_DUE_TARGET) $(LUA_LIBDIR)
283 281
284uninstall: 282uninstall:
285 rm $(LUA_LIBDIR)/lanes_core.$(_SO) 283 rm $(LUA_LIBDIR)/lanes_core.$(_SO)
diff --git a/Shared.makefile b/Shared.makefile
index 492c05d..d1a96fb 100644
--- a/Shared.makefile
+++ b/Shared.makefile
@@ -5,7 +5,7 @@ CC := g++ -std=c++20
5LIBFLAG := -shared 5LIBFLAG := -shared
6 6
7OPT_FLAGS := -O2 7OPT_FLAGS := -O2
8# -O0 -g 8#OPT_FLAGS := -O0 -g3
9 9
10ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW" 10ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW"
11 # MinGW MSYS on Windows 11 # MinGW MSYS on Windows