Update location of generated source files

diff --git a/tools/builder-plugin/gamesetupgenerator.cpp b/tools/builder-plugin/gamesetupgenerator.cpp
index e11355e7a74ee53d54343d8569d5595e38a4a868..59da196537992e49d726a344d964a4108fb3772d 100644 (file)
--- 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()));