add extra env checks

alliedmodders · Oct 25, 2024 · 7edf814 · 7edf814
1 parent 9ecf6c2
commit 7edf814
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/AMBuildScript b/AMBuildScript
@@ -128,6 +128,8 @@ class SMConfig(object):
       self.mms_root = builder.options.mms_path
     else:
       self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
       if not self.mms_root:
         self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
       if not self.mms_root:

diff --git a/hl2sdk-manifests b/hl2sdk-manifests
diff --git a/public/sample_ext/AMBuildScript b/public/sample_ext/AMBuildScript
@@ -118,6 +118,8 @@ class ExtensionConfig(object):
       self.mms_root = builder.options.mms_path
     else:
       self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
       if not self.mms_root:
         self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
       if not self.mms_root:
@@ -131,6 +133,8 @@ class ExtensionConfig(object):
       self.sm_root = builder.options.sm_path
     else:
       self.sm_root = ResolveEnvPath('SOURCEMOD112', 'sourcemod-1.12')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
       if not self.sm_root:
         self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod')
       if not self.sm_root:

diff --git a/public/sample_ext_nosdk/AMBuildScript b/public/sample_ext_nosdk/AMBuildScript
@@ -73,6 +73,8 @@ class ExtensionConfig(object):
       self.mms_root = builder.options.mms_path
     else:
       self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
       if not self.mms_root:
         self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
       if not self.mms_root:
@@ -86,6 +88,8 @@ class ExtensionConfig(object):
       self.sm_root = builder.options.sm_path
     else:
       self.sm_root = ResolveEnvPath('SOURCEMOD112', 'sourcemod-1.12')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
       if not self.sm_root:
         self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod')
       if not self.sm_root: