Merge sp_vm_engine and engine2.

2015-02-24 01:52:14 -08:00
parent 499f7b3929
commit 3cf3f6c3f8
12 changed files with 495 additions and 544 deletions
@@ -4,7 +4,6 @@ import os
 Includes = [
  os.path.join(SM.mms_root, 'core', 'sourcehook'),
  os.path.join(builder.sourcePath, 'sourcepawn', 'jit'),
-  os.path.join(builder.sourcePath, 'sourcepawn', 'jit', 'x86'),
  os.path.join(builder.sourcePath, 'public'),
  os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
  os.path.join(builder.sourcePath, 'public', 'amtl'),
@@ -31,13 +30,12 @@ def setup(binary):
 # Build the static library.
 library = setup(builder.compiler.StaticLibrary('sourcepawn'))
 library.sources += [
+  'api.cpp',
  'plugin-runtime.cpp',
  'compiled-function.cpp',
  'debug-trace.cpp',
-  'engine2.cpp',
  'environment.cpp',
  'sp_vm_basecontext.cpp',
-  'sp_vm_engine.cpp',
  'scripted-invoker.cpp',
  'opcodes.cpp',
  'interpreter.cpp',