Added support for 64-bit Windows (fixes issue #11).

autopilot-rs · May 30, 2011 · dc6b14d · dc6b14d
1 parent 03c55d0
commit dc6b14d
Show file tree

Hide file tree

Showing 15 changed files with 5,187 additions and 0 deletions.
diff --git a/setup.py b/setup.py
@@ -169,6 +169,13 @@ def add_lib(module_dict, lib):
         # We store Windows libraries and headers in our own custom folder.
         win_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                'windows')
+
+
+        # Libraries are statically compiled for their architecture.
+        win_dir = os.path.join(win_dir,
+                               'win64' if platform.architecture()[0] == '64bit'
+                                       else 'win32')
+
         if not os.path.isdir(win_dir):
             raise IOError('windows directory not found at: "%s"' % win_dir)
 

diff --git a/windows/libpng.lib → windows/win32/libpng.lib b/windows/libpng.lib → windows/win32/libpng.lib
diff --git a/windows/png.h → windows/win32/png.h b/windows/png.h → windows/win32/png.h
diff --git a/windows/pngconf.h → windows/win32/pngconf.h b/windows/pngconf.h → windows/win32/pngconf.h
diff --git a/windows/pnglibconf.h → windows/win32/pnglibconf.h b/windows/pnglibconf.h → windows/win32/pnglibconf.h
diff --git a/windows/zconf.h → windows/win32/zconf.h b/windows/zconf.h → windows/win32/zconf.h
diff --git a/windows/zlib.h → windows/win32/zlib.h b/windows/zlib.h → windows/win32/zlib.h
diff --git a/windows/zlib.lib → windows/win32/zlib.lib b/windows/zlib.lib → windows/win32/zlib.lib
diff --git a/windows/win64/libpng.lib b/windows/win64/libpng.lib
diff --git a/windows/win64/png.h b/windows/win64/png.h