Code cleanup

1 files changed, 6 insertions, 12 deletions

diff --git a/setup.py b/setup.py
index 2621bd0..35afa85 100755
--- a/setup.py
+++ b/setup.py
@@ -9,12 +9,13 @@ Usage (Mac OS X):
     python setup.py py2app
 """
 from sys import platform, version_info
+from kcc import __version__
 if version_info[0] != 3:
     print('ERROR: This is Python 3 script!')
     exit(1)
 
 NAME = "KindleComicConverter"
-VERSION = "4.4.1"
+VERSION = __version__
 MAIN = "kcc.py"
 
 if platform == "darwin":
@@ -54,24 +55,17 @@ if platform == "darwin":
 elif platform == "win32":
     # noinspection PyUnresolvedReferences
     import py2exe
-    import platform as arch
     from distutils.core import setup
-    if arch.architecture()[0] == '64bit':
-        suffix = '_64'
-    else:
-        suffix = ''
-    additional_files = [('platforms', ['C:\Python34' + suffix +
-                                       '\Lib\site-packages\PyQt5\plugins\platforms\qwindows.dll']),
+    additional_files = [('platforms', ['C:\Python34\Lib\site-packages\PyQt5\plugins\platforms\qwindows.dll']),
                         ('', ['LICENSE.txt',
                               'other\\7za.exe',
                               'other\\UnRAR.exe',
                               'other\\Additional-LICENSE.txt',
-                              'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libGLESv2.dll',
-                              'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])]
+                              'C:\Python34\Lib\site-packages\PyQt5\libGLESv2.dll',
+                              'C:\Python34\Lib\site-packages\PyQt5\libEGL.dll'])]
     extra_options = dict(
         options={'py2exe': {"bundle_files": 1,
-                            "dll_excludes": ["tcl85.dll", "tk85.dll"],
-                            "dist_dir": "dist" + suffix,
+                            "dist_dir": "dist",
                             "compressed": True,
                             "includes": ["sip"],
                             "excludes": ["tkinter"],