Look for ressources in the dirrectory of the environement

Content.Tests/DMProject/environment.dme

@@ -1,8 +1,5 @@
 // BEGIN_INTERNALS
 // END_INTERNALS
-// BEGIN_FILE_DIR
-#define FILE_DIR .
-// END_FILE_DIR
 // BEGIN_PREFERENCES
 // END_PREFERENCES
 // BEGIN_INCLUDE

DMCompiler/DMCompiler.cs

@@ -66,18 +66,18 @@
             ForcedWarning("Unimplemented proc & var warnings are currently suppressed");
         }
 
         DMPreprocessor preprocessor = Preprocess(this, settings.Files, settings.MacroDefines);
         bool successfulCompile = preprocessor is not null && Compile(preprocessor);
 
         if (successfulCompile) {
             //Output file is the first file with the extension changed to .json
             string outputFile = Path.ChangeExtension(settings.Files[0], "json");
             List<DreamMapJson> maps = ConvertMaps(this, preprocessor.IncludedMaps);
 
             if (ErrorCount > 0) {
                 successfulCompile = false;
             } else {
                 var output = SaveJson(maps, preprocessor.IncludedInterface, outputFile);
                 if (ErrorCount > 0) {
                     successfulCompile = false;
                 } else {
@@ -128,9 +128,13 @@
                 preproc.IncludeFile(includeDir, fileName, false);
             }
 
+            // Adds the root of the DM project to FILE_DIR
+            compiler.AddResourceDirectory(Path.GetDirectoryName(files[0]));
+
             string compilerDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty;
             string dmStandardDirectory = Path.Join(compilerDirectory, "DMStandard");
 
+
             // Push DMStandard to the top of the stack, prioritizing it.
             if (!Settings.NoStandard) {
                 preproc.IncludeFile(dmStandardDirectory, "_Standard.dm", true);
@@ -139,15 +143,15 @@
             // Push the pragma config file to the tippy-top of the stack, super-duper prioritizing it, since it governs some compiler behaviour.
             string pragmaName;
             string pragmaDirectory;
-            if(Settings.PragmaFileOverride is not null) {
+            if (Settings.PragmaFileOverride is not null) {
                 pragmaDirectory = Path.GetDirectoryName(Settings.PragmaFileOverride);
                 pragmaName = Path.GetFileName(Settings.PragmaFileOverride);
             } else {
                 pragmaDirectory = dmStandardDirectory;
                 pragmaName = "DefaultPragmaConfig.dm";
             }
 
-            if(!File.Exists(Path.Join(pragmaDirectory,pragmaName))) {
+            if (!File.Exists(Path.Join(pragmaDirectory, pragmaName))) {
                 ForcedError($"Configuration file '{pragmaName}' not found.");
                 return null;
             }
@@ -336,7 +340,7 @@
 
             try {
                 JsonSerializer.Serialize(outputFileHandle, compiledDream,
-                    new JsonSerializerOptions() {DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault});
+                    new JsonSerializerOptions() { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault });
 
                 return $"Saved to {outputFile}";
             } catch (Exception e) {
@@ -349,7 +353,7 @@
 
     public void DefineFatalErrors() {
         foreach (WarningCode code in Enum.GetValues<WarningCode>()) {
-            if((int)code < 1_000) {
+            if ((int)code < 1_000) {
                 Config.ErrorConfig[code] = ErrorLevel.Error;
             }
         }
@@ -359,7 +363,7 @@
     /// This method also enforces the rule that all emissions with codes less than 1000 are mandatory errors.
     /// </summary>
     public void CheckAllPragmasWereSet() {
-        foreach(WarningCode code in Enum.GetValues<WarningCode>()) {
+        foreach (WarningCode code in Enum.GetValues<WarningCode>()) {
             if (!Config.ErrorConfig.ContainsKey(code)) {
                 ForcedWarning($"Warning #{(int)code:d4} '{code.ToString()}' was never declared as error, warning, notice, or disabled.");
                 Config.ErrorConfig.Add(code, ErrorLevel.Disabled);

TestGame/environment.dme

@@ -1,8 +1,5 @@
 // BEGIN_INTERNALS
 // END_INTERNALS
-// BEGIN_FILE_DIR
-#define FILE_DIR .
-// END_FILE_DIR
 // BEGIN_PREFERENCES
 // END_PREFERENCES
 // BEGIN_INCLUDE