Merge pull request #105 from IkerGalardi/master

Compile editor on linux
PanosK92 · Aug 22, 2023 · f03bb30 · f03bb30
2 parents e7ea972 + da98888
commit f03bb30
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/build_scripts/premake.lua b/build_scripts/premake.lua
@@ -244,14 +244,24 @@ function editor_project_configuration()
         end
 
         -- Files
-        files
-        {
-            EDITOR_DIR .. "/**.rc",
-            EDITOR_DIR .. "/**.h",
-            EDITOR_DIR .. "/**.cpp",
-            EDITOR_DIR .. "/**.hpp",
-            EDITOR_DIR .. "/**.inl"
-        }
+        if os.target() == "windows" then
+            files
+            {
+                EDITOR_DIR .. "/**.rc",
+                EDITOR_DIR .. "/**.h",
+                EDITOR_DIR .. "/**.cpp",
+                EDITOR_DIR .. "/**.hpp",
+                EDITOR_DIR .. "/**.inl"
+            }
+        else
+            files
+            {
+                EDITOR_DIR .. "/**.h",
+                EDITOR_DIR .. "/**.cpp",
+                EDITOR_DIR .. "/**.hpp",
+                EDITOR_DIR .. "/**.inl"
+            }
+        end
 
         -- Includes
         includedirs { RUNTIME_DIR }

diff --git a/runtime/Core/FileSystem.h b/runtime/Core/FileSystem.h
@@ -22,6 +22,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 //= INCLUDES ===========
+#include <vector>
+#include <string>
 #include "Definitions.h"
 //======================