From aad28cbb78d4946d41622ba66d18deb86f0bc54f Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 5 Jul 2016 14:53:26 +0100 Subject: [PATCH] wmakeCollect: Name the object makefiles based on the object path Ensures the order of compilation relates to the location of the source files --- wmake/wmakeCollect | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wmake/wmakeCollect b/wmake/wmakeCollect index c0435e4af5..99c7413ae7 100755 --- a/wmake/wmakeCollect +++ b/wmake/wmakeCollect @@ -125,12 +125,12 @@ then # Make sure directories exist mkdir -p $collectDir - # Unique file name for makefile for the current target - file="$collectDir/$$_${RANDOM}" - # The current target object="${@: -1:1}" + # Create a unique name for the makefile from the object path + file=$collectDir/${object////_} + # Add the current target to the list of objects echo "OBJECTS += $object" >> $file