From 87b45df71dd1ee7de265531e26f1acb997a2c3c9 Mon Sep 17 00:00:00 2001 From: coppro Date: Mon, 2 Mar 2009 23:29:38 +0000 Subject: [PATCH] Updated linux installer; minor semantic bug affecting 64-bit builds git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1373 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/set/style_panel.cpp | 2 +- tools/linux-installer/tarball | 2 +- tools/linux-installer/tarball-limited | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/set/style_panel.cpp b/src/gui/set/style_panel.cpp index 0bf8a87e..c3cd840f 100644 --- a/src/gui/set/style_panel.cpp +++ b/src/gui/set/style_panel.cpp @@ -70,7 +70,7 @@ void StylePanel::updateListSize() { // we only need enough columns to show all items int x_room = GetSize().x - editor->GetBestSize().x - 6; size_t need_columns = (size_t)ceil(list->requiredWidth() / (double)x_room); - size_t column_count = max(1u, min(fit_columns, need_columns)); + size_t column_count = max(1ul, min(fit_columns, need_columns)); // change count if (column_count != list->column_count) { list->column_count = column_count; diff --git a/tools/linux-installer/tarball b/tools/linux-installer/tarball index a5f0882b..2fed6aa3 100755 --- a/tools/linux-installer/tarball +++ b/tools/linux-installer/tarball @@ -7,6 +7,6 @@ mkdir magicseteditor/program cp -rP ../../data ~/.magicseteditor/resource ../../magicseteditor magicseteditor/program; cp install README magicseteditor; -tar -cf magicseteditor.tar.gz --owner root --exclude=.* --exclude=*~ --exclude=.svn magicseteditor; +tar -cfz magicseteditor.tar.gz --owner root --exclude=.* --exclude=*~ --exclude=.svn magicseteditor; rm -rf magicseteditor; diff --git a/tools/linux-installer/tarball-limited b/tools/linux-installer/tarball-limited index bbb55b0e..6315fcc5 100755 --- a/tools/linux-installer/tarball-limited +++ b/tools/linux-installer/tarball-limited @@ -38,6 +38,6 @@ done; cp -rP ~/.magicseteditor/resource ../../magicseteditor magicseteditor/program; cp install README magicseteditor; -tar -cf magicseteditor-limited.tar.gz --owner root --exclude=.* --exclude=*~ --exclude=.svn magicseteditor; +tar -cfz magicseteditor-limited.tar.gz --owner root --exclude=.* --exclude=*~ --exclude=.svn magicseteditor; rm -rf magicseteditor;