* add zip .a for OSx

* adjust layout for savethingy in Osx
This commit is contained in:
giantpune@gmail.com 2011-01-02 09:39:30 +00:00
parent 064affec01
commit fe3ec0de0a
4 changed files with 17 additions and 4 deletions

1
.gitattributes vendored
View File

@ -113,6 +113,7 @@ saveToy/quazip/include/zip.h -text
saveToy/quazip/include/zlib.h -text saveToy/quazip/include/zlib.h -text
saveToy/quazip/lib/linux_x64/libquazip.a -text saveToy/quazip/lib/linux_x64/libquazip.a -text
saveToy/quazip/lib/linux_x86/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/quazip/lib/win32/libquazip.a -text
saveToy/rc.qrc -text saveToy/rc.qrc -text
saveToy/readmii.txt -text saveToy/readmii.txt -text

View File

@ -10,12 +10,21 @@
#include "quazip.h" #include "quazip.h"
#include "quazipfile.h" #include "quazipfile.h"
//TODO... get these from settings and dont use global variables //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"; static QString sneekPath = "/media/SDHC_4GB";
#endif
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), bannerthread( this ) MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), bannerthread( this )
{ {
ui->setupUi(this); ui->setupUi(this);
#ifdef Q_WS_MAC
ui->listWidget_sneekSaves->setFixedWidth( 630 );
ui->listWidget_pcSaves->setFixedWidth( 630 );
#endif
ClearSneekGuiInfo(); ClearSneekGuiInfo();
ClearPcGuiInfo(); ClearPcGuiInfo();
progressBar.setVisible( false ); progressBar.setVisible( false );
@ -47,6 +56,7 @@ MainWindow::~MainWindow()
//get the saves from a nand directory //get the saves from a nand directory
void MainWindow::GetSavesFromSneek( const QString &path ) void MainWindow::GetSavesFromSneek( const QString &path )
{ {
qDebug() << "MainWindow::GetSavesFromSneek" << path;
if( !QFileInfo( path ).exists() ) if( !QFileInfo( path ).exists() )
return; return;

Binary file not shown.

View File

@ -72,7 +72,11 @@ win32 {
message("win32 build") message("win32 build")
LIBS += -L./quazip/lib/win32 -lquazip 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) { !contains(QMAKE_HOST.arch, x86_64) {
message("x86 build") message("x86 build")
LIBS += -L./quazip/lib/linux_x86 -lquazip LIBS += -L./quazip/lib/linux_x86 -lquazip
@ -81,6 +85,4 @@ unix {
LIBS += -L./quazip/lib/linux_x64 -lquazip LIBS += -L./quazip/lib/linux_x64 -lquazip
} }
} }
macx{
message("still need to build quazlib for mac")
}