From 6f1eefbdbe8eb968425fa477dacb82279065a257 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sat, 7 Mar 2015 11:07:20 -0800
Subject: [PATCH] Strip internal SourcePawn dependencies on SM relative paths.

---
 sourcepawn/compiler/AMBuilder   | 5 ++---
 sourcepawn/compiler/amx.h       | 2 +-
 sourcepawn/compiler/sc1.cpp     | 4 ++--
 sourcepawn/compiler/sc2.cpp     | 2 +-
 sourcepawn/compiler/sc6.cpp     | 2 +-
 sourcepawn/compiler/scstate.cpp | 2 +-
 sourcepawn/vm/AMBuilder         | 4 ++--
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sourcepawn/compiler/AMBuilder b/sourcepawn/compiler/AMBuilder
index b3a82d0f..3d468c99 100644
--- a/sourcepawn/compiler/AMBuilder
+++ b/sourcepawn/compiler/AMBuilder
@@ -44,9 +44,8 @@ compiler.includes += [
   os.path.join(builder.sourcePath, 'public'),
   os.path.join(builder.sourcePath, 'public', 'amtl'),
   os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
-  os.path.join(builder.sourcePath, 'sourcepawn', 'compiler'),
-  os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
-  os.path.join(builder.sourcePath, 'sourcepawn', 'third_party'),
+  os.path.join(builder.currentSourcePath, '..', 'include'),
+  os.path.join(builder.currentSourcePath, '..', 'third_party'),
   os.path.join(builder.buildPath, 'includes'),
   os.path.join(builder.buildPath, builder.buildFolder),
 ]
diff --git a/sourcepawn/compiler/amx.h b/sourcepawn/compiler/amx.h
index 7ed08dce..c3dc6dd7 100644
--- a/sourcepawn/compiler/amx.h
+++ b/sourcepawn/compiler/amx.h
@@ -31,7 +31,7 @@
   #define __FreeBSD__
 #endif
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #if defined HAVE_STDINT_H
diff --git a/sourcepawn/compiler/sc1.cpp b/sourcepawn/compiler/sc1.cpp
index ff6cd857..9e74e96b 100644
--- a/sourcepawn/compiler/sc1.cpp
+++ b/sourcepawn/compiler/sc1.cpp
@@ -37,8 +37,8 @@
 #endif
 
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined DARWIN
-  #include <sclinux.h>
-  #include <binreloc.h> /* from BinReloc, see www.autopackage.org */
+  #include "sclinux.h"
+  #include "binreloc.h" /* from BinReloc, see www.autopackage.org */
   #include <unistd.h>
 #endif
 
diff --git a/sourcepawn/compiler/sc2.cpp b/sourcepawn/compiler/sc2.cpp
index 4fccaeef..aeca1967 100644
--- a/sourcepawn/compiler/sc2.cpp
+++ b/sourcepawn/compiler/sc2.cpp
@@ -31,7 +31,7 @@
 #include "sc.h"
 #include "tokenbuffer.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 #include "sp_symhash.h"
 
diff --git a/sourcepawn/compiler/sc6.cpp b/sourcepawn/compiler/sc6.cpp
index 67ed56ce..bb6e9662 100644
--- a/sourcepawn/compiler/sc6.cpp
+++ b/sourcepawn/compiler/sc6.cpp
@@ -34,7 +34,7 @@
 #include "sc.h"
 #include "amxdbg.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 #include <am-utility.h>
 #include <am-string.h>
diff --git a/sourcepawn/compiler/scstate.cpp b/sourcepawn/compiler/scstate.cpp
index 8c772804..c9a16bab 100644
--- a/sourcepawn/compiler/scstate.cpp
+++ b/sourcepawn/compiler/scstate.cpp
@@ -52,7 +52,7 @@
 #include <string.h>
 #include "sc.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #if defined FORTIFY
diff --git a/sourcepawn/vm/AMBuilder b/sourcepawn/vm/AMBuilder
index cd39301f..607a32f1 100644
--- a/sourcepawn/vm/AMBuilder
+++ b/sourcepawn/vm/AMBuilder
@@ -3,8 +3,8 @@ import os
 
 Includes = [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
-  os.path.join(builder.sourcePath, 'sourcepawn', 'vm'),
-  os.path.join(builder.sourcePath, 'sourcepawn', 'third_party'),
+  os.path.join(builder.currentSourcePath),
+  os.path.join(builder.currentSourcePath, '..', 'third_party'),
   os.path.join(builder.sourcePath, 'public'),
   os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
   os.path.join(builder.sourcePath, 'public', 'amtl'),