summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--compiler/nimconf.nim11
1 files changed, 8 insertions, 3 deletions
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim
index cd1fa784f..5304dc265 100644
--- a/compiler/nimconf.nim
+++ b/compiler/nimconf.nim
@@ -246,6 +246,11 @@ proc loadConfigs*(cfg: string) =
     
     if gProjectName.len != 0:
       # new project wide config file:
-      let projectConfig = changeFileExt(gProjectFull, "nim.cfg")
-      if fileExists(projectConfig): readConfigFile(projectConfig)
-      else: readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg"))
+      var projectConfig = changeFileExt(gProjectFull, "nimcfg")
+      if not fileExists(projectConfig):
+        projectConfig = changeFileExt(gProjectFull, "nim.cfg")
+      if not fileExists(projectConfig):
+        projectConfig = changeFileExt(gProjectFull, "nimrod.cfg")
+        if fileExists(projectConfig):
+          rawMessage(warnDeprecated, projectConfig)
+      readConfigFile(projectConfig)