Jitter: merge jitcoreARCH and vm_mngr

1 files changed, 24 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index fcc8f7a6..d37e9454 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def buil_all():
               'miasm2/jitter/arch',
               'miasm2/jitter/os_dep',
               ]
-
+    """
     ext_modules_no_tcc = [
         Extension("miasm2.jitter.vm_mngr",
                   ["miasm2/jitter/vm_mngr.c",
@@ -52,12 +52,33 @@ def buil_all():
                   ["miasm2/jitter/Jittcc.c"],
                   libraries=["tcc"])
         ]
+    """
 
+    ext_modules_all = [
+        Extension("miasm2.jitter.arch.JitCore_x86",
+                  ["miasm2/jitter/vm_mngr.c",
+                   "miasm2/jitter/vm_mngr_py.c",
+                   "miasm2/jitter/arch/JitCore_x86.c"]),
+        Extension("miasm2.jitter.arch.JitCore_arm",
+                  ["miasm2/jitter/vm_mngr.c",
+                   "miasm2/jitter/vm_mngr_py.c",
+                   "miasm2/jitter/arch/JitCore_arm.c"]),
+        Extension("miasm2.jitter.arch.JitCore_msp430",
+                  ["miasm2/jitter/vm_mngr.c",
+                   "miasm2/jitter/vm_mngr_py.c",
+                   "miasm2/jitter/arch/JitCore_msp430.c"]),
+        Extension("miasm2.jitter.Jitllvm",
+                  ["miasm2/jitter/Jitllvm.c"]),
+        Extension("miasm2.jitter.Jittcc",
+                  ["miasm2/jitter/Jittcc.c"],
+                  libraries=["tcc"])
+        ]
 
     print 'building'
     build_ok = False
-    for name, ext_modules in [('all', ext_modules_all),
-                              ('notcc', ext_modules_no_tcc)]:
+    #for name, ext_modules in [('all', ext_modules_all),
+    #                          ('notcc', ext_modules_no_tcc)]:
+    for name, ext_modules in [('all', ext_modules_all)]:
         print 'build with', repr(name)
         try:
             s = setup(