Move macro assembler out of public/assembler into sourcepawn/vm/x86.

sourcepawn/vm/AMBuilder

@@ -47,6 +47,7 @@ library.sources += [
   'stack-frames.cpp',
   'smx-v1-image.cpp',
   'watchdog_timer.cpp',
+  'x86/assembler-x86.cpp',
   'x86/code-stubs-x86.cpp',
   'x86/jit_x86.cpp',
   'x86/x86-utils.cpp',
@@ -62,7 +63,6 @@ library.sources += [
   '../third_party/zlib/trees.c',
   '../third_party/zlib/uncompr.c',
   '../third_party/zlib/zutil.c',
-  '../../public/jit/x86/assembler-x86.cpp',
 ]
 libsourcepawn = builder.Add(library).binary
 

sourcepawn/vm/x86/assembler-x86.cpp

@@ -28,6 +28,6 @@
  *
  * Version: $Id$
  */
-#include <assembler-x86.h>
+#include "assembler-x86.h"
 
 CPUFeatures AssemblerX86::X86Features;

sourcepawn/vm/x86/jit_x86.h

@@ -19,12 +19,12 @@
 
 #include <sp_vm_types.h>
 #include <sp_vm_api.h>
-#include <macro-assembler-x86.h>
 #include <am-vector.h>
 #include "plugin-runtime.h"
 #include "plugin-context.h"
 #include "compiled-function.h"
 #include "opcodes.h"
+#include "macro-assembler-x86.h"
 
 using namespace SourcePawn;
 

sourcepawn/vm/x86/macro-assembler-x86.h

@@ -34,7 +34,7 @@
 #include <assembler.h>
 #include <am-vector.h>
 #include <string.h>
-#include <assembler-x86.h>
+#include "assembler-x86.h"
 
 class MacroAssemblerX86 : public AssemblerX86
 {

sourcepawn/vm/x86/x86-utils.h

@@ -14,7 +14,7 @@
 #define _include_sourcepawn_vm_x86_utils_h_
 
 #include <stdint.h>
-#include <macro-assembler-x86.h>
+#include "macro-assembler-x86.h"
 
 namespace sp {