diff --git a/.gitattributes b/.gitattributes index 513600c..f284540 100644 --- a/.gitattributes +++ b/.gitattributes @@ -113,6 +113,7 @@ saveToy/quazip/include/zip.h -text saveToy/quazip/include/zlib.h -text saveToy/quazip/lib/linux_x64/libquazip.a -text saveToy/quazip/lib/linux_x86/libquazip.a -text +saveToy/quazip/lib/mac/libquazip.a -text saveToy/quazip/lib/win32/libquazip.a -text saveToy/rc.qrc -text saveToy/readmii.txt -text diff --git a/saveToy/mainwindow.cpp b/saveToy/mainwindow.cpp index 4a3f207..1563581 100644 --- a/saveToy/mainwindow.cpp +++ b/saveToy/mainwindow.cpp @@ -10,12 +10,21 @@ #include "quazip.h" #include "quazipfile.h" + //TODO... get these from settings and dont use global variables +#ifdef Q_WS_MAC +static QString sneekPath = "/Volumes/VMware Shared Folders/host-c/QtWii/test"; +#else static QString sneekPath = "/media/SDHC_4GB"; +#endif MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), bannerthread( this ) { ui->setupUi(this); +#ifdef Q_WS_MAC + ui->listWidget_sneekSaves->setFixedWidth( 630 ); + ui->listWidget_pcSaves->setFixedWidth( 630 ); +#endif ClearSneekGuiInfo(); ClearPcGuiInfo(); progressBar.setVisible( false ); @@ -47,6 +56,7 @@ MainWindow::~MainWindow() //get the saves from a nand directory void MainWindow::GetSavesFromSneek( const QString &path ) { + qDebug() << "MainWindow::GetSavesFromSneek" << path; if( !QFileInfo( path ).exists() ) return; diff --git a/saveToy/quazip/lib/mac/libquazip.a b/saveToy/quazip/lib/mac/libquazip.a new file mode 100644 index 0000000..692b3a0 Binary files /dev/null and b/saveToy/quazip/lib/mac/libquazip.a differ diff --git a/saveToy/saveToy.pro b/saveToy/saveToy.pro index bcc79a0..585b871 100644 --- a/saveToy/saveToy.pro +++ b/saveToy/saveToy.pro @@ -72,7 +72,11 @@ win32 { message("win32 build") LIBS += -L./quazip/lib/win32 -lquazip } -unix { +macx{ + message("mac build") + LIBS += -L./quazip/lib/mac -lquazip +} +else unix { !contains(QMAKE_HOST.arch, x86_64) { message("x86 build") LIBS += -L./quazip/lib/linux_x86 -lquazip @@ -81,6 +85,4 @@ unix { LIBS += -L./quazip/lib/linux_x64 -lquazip } } -macx{ - message("still need to build quazlib for mac") -} +