root/Softs/py2exe-0.6.6_one_exe.diff

py2exe/build_exe.py

@@ -464 +464 @@
             if base.lower() in self.dlls_in_exedir:
                 # pythonXY.dll must be bundled as resource.
                 # w9xpopen.exe must be copied to self.exe_dir.
-                if base.lower() == python_dll.lower() and self.bundle_files < 2:
+                if (base.lower() == python_dll.lower() or base.lower() == "msvcr71.dll") and self.bundle_files < 2:
                     dst = os.path.join(self.bundle_dir, base)
                 else:
                     dst = os.path.join(self.exe_dir, base)
@@ -789 +789 @@
 
             # add the pythondll as resource, and delete in self.exe_dir
             if self.bundle_files < 2 and self.distribution.zipfile is None:
-                # bundle pythonxy.dll
-                dll_path = os.path.join(self.bundle_dir, python_dll)
-                bytes = open(dll_path, "rb").read()
-                # image, bytes, lpName, lpType
+                def add_resource_dll( name ):
+                    # bundle pythonxy.dll
+                    dll_path = os.path.join(self.bundle_dir, name)
+                    bytes = open(dll_path, "rb").read()
+                    # image, bytes, lpName, lpType
 
-                print "Adding %s as resource to %s" % (python_dll, exe_path)
-                add_resource(unicode(exe_path), bytes,
+                    print "Adding %s as resource to %s" % (name, exe_path)
+                    add_resource(unicode(exe_path), bytes,
                              # for some reason, the 3. argument MUST BE UPPER CASE,
                              # otherwise the resource will not be found.
-                             unicode(python_dll).upper(), 1, False)
+                             unicode(name).upper(), 1, False)
+                add_resource_dll( "msvcr71.dll" )
+                add_resource_dll( python_dll )
 
             if self.compressed and self.bundle_files < 3 and self.distribution.zipfile is None:
                 zlib_file = imp.find_module("zlib")[0]

py2exe-0.6.

@@ -52 +52 @@
             del kw['target_desc']
         else:
             self.target_desc = "executable"
+        kw['extra_compile_args'] = ["/MT"]
         Extension.__init__(self, *args, **kw)
 
 
@@ -345 +346 @@
                           "source/_memimporter_module.c"],
                          depends=depends + ["source/_memimporter.c"],
                          define_macros=macros,
+                         extra_compile_args=["/MT"]
                          )
 
 run = Interpreter("py2exe.run",
@@ -446 +448 @@
       ext_modules = [_memimporter,
                      Extension("py2exe.py2exe_util",
                                sources=["source/py2exe_util.c"],
-                               libraries=["imagehlp"]),
+                               libraries=["imagehlp"],
+                               extra_compile_args=["/MT"]),
                      ],
       py_modules = ["zipextimporter"],
       scripts = ["py2exe_postinstall.py"],

source/start.c

@@ -160 +160 @@
         return data;
 }
 
+void _TryLoadCRTDLLFromResource(HMODULE hmod, char* dllName)
+{
+        HRSRC hrsrc = FindResource(hmod, MAKEINTRESOURCE(1), dllName);
+        if (hrsrc) {
+                int i;
+                HMODULE hmod = NULL;
+                struct IMPORT *p = imports;
+                HGLOBAL hgbl = LoadResource(hmod, hrsrc);
+                char *bytes = LockResource(hgbl);
+                if (!bytes)
+                        return;
+                hmod = MemoryLoadLibrary(dllName, bytes);
+                if (hmod) {
+                        for (i = 0; p->name; ++i, ++p) {
+                                p->proc = (void (*)())MemoryGetProcAddress(hmod, p->name);
+                                if (p->proc == NULL) {
+                                        break;
+                                }
+                        }
+                }
+        }
+}
+
 BOOL _LoadPythonDLL(HMODULE hmod)
 {
         HRSRC hrsrc;
@@ -169 +192 @@
         if (!dirname[0])
                 calc_dirname(hmod);
 
+        _TryLoadCRTDLLFromResource(hmod, "MSVCR71.DLL");
+
         // Try to locate pythonxy.dll as resource in the exe
         hrsrc = FindResource(hmod, MAKEINTRESOURCE(1), PYTHONDLL);
         if (hrsrc) {