From e6cdcc9ee2251ccf8b1070288cbb40529f95eb7a Mon Sep 17 00:00:00 2001 From: Alexander Shaduri Date: Thu, 15 Jun 2017 20:07:23 +0000 Subject: [PATCH] Fixed win64 zip packaging. --- gsmartcontrol/Makefile.am | 2 ++ gsmartcontrol/configure-dev | 2 +- gsmartcontrol/src/gsc_main_window.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gsmartcontrol/Makefile.am b/gsmartcontrol/Makefile.am index 41b7ea5..4b0f90d 100644 --- a/gsmartcontrol/Makefile.am +++ b/gsmartcontrol/Makefile.am @@ -76,6 +76,8 @@ win-dist-prepare-all: nsis-dist-prepare win-zip-dist-prepare GTK_BIN_FILES = gdk-pixbuf-query-loaders.exe \ gspawn-win32-helper-console.exe \ gspawn-win32-helper.exe \ + gspawn-win64-helper-console.exe \ + gspawn-win64-helper.exe \ gtk-query-immodules-3.0.exe \ gtk-update-icon-cache-3.0.exe \ libatk-1.*.dll \ diff --git a/gsmartcontrol/configure-dev b/gsmartcontrol/configure-dev index aa01ffc..843f59b 100755 --- a/gsmartcontrol/configure-dev +++ b/gsmartcontrol/configure-dev @@ -46,7 +46,7 @@ case $type in win64-cross) flags="PATH=\"/usr/x86_64-w64-mingw32/bin:/usr/x86_64-w64-mingw32/sys-root/mingw/bin:$PATH\" \ --with-nsis=/usr/bin/makensis --with-windows-sysroot=/usr/x86_64-w64-mingw32/sys-root/mingw \ - --enable-optimize-options --enable-tests --host=i686-w64-mingw32" ;; + --enable-optimize-options --enable-tests --host=x86_64-w64-mingw32" ;; win64-cross-debug) flags="PATH=\"/usr/x86_64-w64-mingw32/bin:/usr/x86_64-w64-mingw32/sys-root/mingw/bin:$PATH\" \ --enable-debug-options --enable-tests --host=x86_64-w64-mingw32" ;; diff --git a/gsmartcontrol/src/gsc_main_window.cpp b/gsmartcontrol/src/gsc_main_window.cpp index 16a541a..87be36e 100644 --- a/gsmartcontrol/src/gsc_main_window.cpp +++ b/gsmartcontrol/src/gsc_main_window.cpp @@ -56,7 +56,7 @@ GscMainWindow::GscMainWindow(BaseObjectType* gtkcobj, const app_ui_res_ref_t& re // iconview, gtkuimanager stuff (menus), custom labels create_widgets(); - set_default_size(600, 560); + set_default_size(600, 540); // show the window first, scan later show();