From 15fc366e94b9c6fe02d882a2ca0b594c327cdf9e Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 12 Mar 2023 17:14:01 +0200
Subject: [PATCH] Update location of generated source files

---
 tools/builder-plugin/gamesetupgenerator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/builder-plugin/gamesetupgenerator.cpp b/tools/builder-plugin/gamesetupgenerator.cpp
index e11355e..59da196 100644
--- a/tools/builder-plugin/gamesetupgenerator.cpp
+++ b/tools/builder-plugin/gamesetupgenerator.cpp
@@ -1,6 +1,7 @@
 #include "gamesetupgenerator.h"
 #include <msp/builder/builder.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/utils.h>
 #include "gamesetupdefinitions.h"
 
 using namespace std;
@@ -28,9 +29,8 @@ Target *GameSetupGenerator::create_target(const vector<Target *> &sources, const
 	GameSetupDefinitions &defs = dynamic_cast<GameSetupDefinitions &>(*sources.front());
 
 	const Component &comp = *defs.get_component();
-	const SourcePackage &spkg = comp.get_package();
-	FS::Path dir = spkg.get_temp_directory()/"generated";
-	dir /= FS::dirname(FS::relative(defs.get_path(), spkg.get_source_directory()));
+	string subdir = join(string("generated"), "_", comp.flatten_source_path(FS::dirname(defs.get_path())));
+	FS::Path dir = comp.get_temp_directory()/subdir;
 
 	Tool &compiler = builder.get_toolchain().get_tool("CC");
 	string base = FS::basepart(FS::basename(defs.get_path()));
-- 
2.45.2