prog

src/dawn/scene/components/debug/FPSLabelComponent.hpp

@@ -9,7 +9,9 @@
 namespace Dawn {
   class FPSLabelComponent : public SceneItemComponent {
     public:
+      // @optional
       UILabel *label;
+      
       FPSLabelComponent(SceneItem *item);
       void onStart() override;
   };

src/dawntools/prefabtool/PrefabTool.cpp

@@ -34,7 +34,7 @@ struct PrefabComponentParserRuleset PrefabRegistry::getRuleset(std::string type)
           } else {
             // Begin scanning contentsr
             // std::string include = this->sources;
-            auto toRemove = File::normalizeSlashes(this->sources + "/");
+            auto toRemove = File::normalizeSlashes(this->sources + FILE_PATH_SEP);
             auto includePath = file.filename.substr(toRemove.size(), file.filename.size() - toRemove.size());
 
             // Now locate the first subdir since we don't want to include the root path (e.g. dawn, dawnrose, etc)
@@ -44,6 +44,12 @@ struct PrefabComponentParserRuleset PrefabRegistry::getRuleset(std::string type)
             }
             
             struct PrefabComponentParserRuleset ruleset;
+            // Replace all file seps with slashes
+            size_t pos = 0;
+            while ((pos = includePath.find(FILE_PATH_SEP, pos)) != std::string::npos) {
+              includePath.replace(pos, 1, "/");
+              pos += 1;
+            }
             ruleset.include = includePath;
             ruleset.name = type;
 
@@ -118,7 +124,7 @@ int32_t PrefabTool::start() {
   }
 
   struct PrefabRegistry registry;
-  registry.sources = flags["sources"];
+  registry.sources = File::normalizeSlashes(flags["sources"]);
 
   auto xml = Xml::load(data);
   std::string error;