瀏覽代碼

When running from source tree with a dev build, adjust the AtomicExamples source folder

Josh Engebretson 9 年之前
父節點
當前提交
447e629918

+ 6 - 0
Script/AtomicEditor/resources/ProjectTemplates.ts

@@ -107,6 +107,12 @@ export function getExampleProjectTemplateDefinitions(): [ProjectTemplateDefiniti
     exampleFolders.forEach(exampleFolder => {
 
         let folder = Atomic.addTrailingSlash(env.toolDataDir + "AtomicExamples/" + exampleFolder);
+
+        // if we're building from source tree, adjust the path
+        if (Atomic.AtomicBuildInfo.getDevBuild()) {
+            folder = Atomic.addTrailingSlash(env.rootSourceDir + "Submodules/AtomicExamples/" + exampleFolder);
+        }
+
         let screenshot = folder + "Screenshot.png";
 
         if (!fileSystem.dirExists(folder)) {

+ 9 - 0
Source/Atomic/BuildInfo/AtomicBuildInfo.cpp

@@ -35,6 +35,15 @@ String AtomicBuildInfo::GetBuildName()
 #endif
 }
 
+bool AtomicBuildInfo::GetDevBuild()
+{
+#ifdef ATOMIC_DEV_BUILD
+    return true;
+#else
+    return false;
+#endif
+}
+
 bool AtomicBuildInfo::GetDistBuild()
 {
 #ifdef ATOMIC_BUILD_DIST

+ 4 - 1
Source/Atomic/BuildInfo/AtomicBuildInfo.h

@@ -52,7 +52,10 @@ class AtomicBuildInfo : public RefCounted
     /// Get the build string in form (BuildName): BuildDate BuildTime Git:SHA
     static String GetBuildString();
 
-    /// Get whether this is a dist build
+    /// Get whether this is binary or source tree development build
+    static bool GetDevBuild();
+
+    /// Get whether this is a distibution/installer binary build
     static bool GetDistBuild();
 
 };

+ 1 - 0
Source/Atomic/CMakeLists.txt

@@ -92,6 +92,7 @@ GroupSources("Scene")
 GroupSources("UI")
 GroupSources("Web")
 GroupSources("Script")
+GroupSources("BuildInfo")
 
 # Handle Git Revision
 include(GetGitRevisionDescription)