From d63811d1892027a2aaba9a6e859492ffe5ef9045 Mon Sep 17 00:00:00 2001 From: Insoleet <insomniak.fr@gmail.com> Date: Mon, 1 Feb 2016 13:06:20 +0100 Subject: [PATCH] Fixing build on windows --- sakia.spec | 14 +++++++++++--- src/sakia/main.py | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sakia.spec b/sakia.spec index f3dfc1cf..c0abac32 100644 --- a/sakia.spec +++ b/sakia.spec @@ -1,8 +1,11 @@ # -*- mode: python -*- -from PyInstaller.compat import is_darwin +from PyInstaller.compat import is_darwin, is_win +import ctypes block_cipher = None + + a = Analysis(['src/sakia/main.py'], pathex=['.'], binaries=None, @@ -19,6 +22,10 @@ if is_darwin: a.binaries = a.binaries - TOC([ ('/usr/local/lib/libsodium.so', None, None),]) +if is_win: + a.binaries = a.binaries + TOC([('libsodium.dll', ctypes.util.find_library('libsodium.dll'), 'BINARY')]) + print(a.binaries) + pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) @@ -26,10 +33,11 @@ exe = EXE(pyz, a.scripts, exclude_binaries=True, name='sakia', - debug=True, + debug=False, strip=False, upx=True, - console=True ) + console=False, + icon='sakia.ico') coll = COLLECT(exe, a.binaries, diff --git a/src/sakia/main.py b/src/sakia/main.py index 1af2b7b2..07fc4b84 100755 --- a/src/sakia/main.py +++ b/src/sakia/main.py @@ -18,8 +18,8 @@ import PyQt5.QtSvg from quamash import QSelectorEventLoop from PyQt5.QtWidgets import QApplication -from .gui.mainwindow import MainWindow -from .core.app import Application +from sakia.gui.mainwindow import MainWindow +from sakia.core.app import Application def async_exception_handler(loop, context): -- GitLab