mirror of
https://github.com/martravi/wiiqt.git
synced 2024-11-14 13:25:11 +01:00
Merge pull request #1 from Brawl345/master
Fix building for Linux, Remove svnrev everywhere, Add GitHub Action
This commit is contained in:
commit
64223d1691
37
.github/workflows/build.yml
vendored
Normal file
37
.github/workflows/build.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
name: Build
|
||||
on:
|
||||
- push
|
||||
- pull_request
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: build
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
project:
|
||||
[
|
||||
{ folder: "breft_editor", target: "breft" },
|
||||
{ folder: "nand_dump", target: "nand" },
|
||||
{ folder: "nandBinCheck", target: "nandBinCheck" },
|
||||
{ folder: "nandExtract", target: "nandExtract" },
|
||||
{ folder: "ohneschwanzenegger", target: "refleurii" },
|
||||
{ folder: "punetwiin", target: "punetween" },
|
||||
{ folder: "symbolizer", target: "symbolizer" },
|
||||
]
|
||||
fail-fast: false
|
||||
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup dependencies
|
||||
run: |
|
||||
sudo add-apt-repository ppa:rock-core/qt4 -y
|
||||
sudo apt install qt4-dev-tools libqt4-dev libqtcore4 libqtgui4 g++ -y
|
||||
|
||||
- name: Compile
|
||||
run: |
|
||||
cd ${{ matrix.project.folder }}
|
||||
qmake -qt=qt4 ${{ matrix.project.target }}.pro
|
||||
make -f Makefile
|
52
.gitignore
vendored
Normal file
52
.gitignore
vendored
Normal file
@ -0,0 +1,52 @@
|
||||
# C++ objects and libs
|
||||
*.slo
|
||||
*.lo
|
||||
*.o
|
||||
*.a
|
||||
*.la
|
||||
*.lai
|
||||
*.so
|
||||
*.so.*
|
||||
*.dll
|
||||
*.dylib
|
||||
|
||||
# Qt-es
|
||||
object_script.*.Release
|
||||
object_script.*.Debug
|
||||
*_plugin_import.cpp
|
||||
/.qmake.cache
|
||||
/.qmake.stash
|
||||
*.pro.user
|
||||
*.pro.user.*
|
||||
*.qbs.user
|
||||
*.qbs.user.*
|
||||
*.moc
|
||||
moc_*.cpp
|
||||
moc_*.h
|
||||
qrc_*.cpp
|
||||
ui_*.h
|
||||
*.qmlc
|
||||
*.jsc
|
||||
Makefile*
|
||||
*build-*
|
||||
*.qm
|
||||
*.prl
|
||||
|
||||
# Qt unit tests
|
||||
target_wrapper.*
|
||||
|
||||
# QtCreator
|
||||
*.autosave
|
||||
|
||||
# QtCreator Qml
|
||||
*.qmlproject.user
|
||||
*.qmlproject.user.*
|
||||
|
||||
# QtCreator CMake
|
||||
CMakeLists.txt.user*
|
||||
|
||||
# QtCreator 4.8< compilation database
|
||||
compile_commands.json
|
||||
|
||||
# QtCreator local machine specific files for imported projects
|
||||
*creator.user*
|
@ -1,6 +1,3 @@
|
||||
|
||||
#include "svnrev.h"
|
||||
|
||||
#include "../WiiQt/includes.h"
|
||||
#include "../WiiQt/nandbin.h"
|
||||
#include "../WiiQt/sharedcontentmap.h"
|
||||
@ -1323,7 +1320,6 @@ int main( int argc, char *argv[] )
|
||||
|
||||
qCritical() << "** nandBinCheck : Wii nand info tool **";
|
||||
qCritical() << " from giantpune";
|
||||
qCritical() << " svn r:" << qPrintable( CleanSvnStr( SVN_REV_STR ) );
|
||||
qCritical() << " built:" << __DATE__ << __TIME__;
|
||||
|
||||
if( args.contains( "-about", Qt::CaseInsensitive ) )
|
||||
|
@ -43,13 +43,3 @@ HEADERS += ../WiiQt/tiktmd.h \
|
||||
|
||||
FORMS += \
|
||||
../WiiQt/settingtxtdialog.ui
|
||||
|
||||
# create new svnrev.h
|
||||
unix {
|
||||
system( chmod 755 ../tools/makesvnrev.sh )
|
||||
system( ../tools/makesvnrev.sh )
|
||||
}
|
||||
|
||||
win32 {
|
||||
system( "..\\tools\\SubWCRev.exe" "." "..\\tools\\svnrev_template.h" ".\\svnrev.h" )
|
||||
}
|
||||
|
@ -28,13 +28,3 @@ FORMS += nandwindow.ui \
|
||||
|
||||
RESOURCES += \
|
||||
rc.qrc
|
||||
|
||||
# create new svnrev.h
|
||||
unix {
|
||||
system( chmod 755 ../tools/makesvnrev.sh )
|
||||
system( ../tools/makesvnrev.sh )
|
||||
}
|
||||
|
||||
win32 {
|
||||
system( "..\\tools\\SubWCRev.exe" "." "..\\tools\\svnrev_template.h" ".\\svnrev.h" )
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "nandwindow.h"
|
||||
#include "svnrev.h"
|
||||
#include "ui_nandwindow.h"
|
||||
#include "boot2infodialog.h"
|
||||
#include "../WiiQt/tools.h"
|
||||
@ -8,7 +7,7 @@ NandWindow::NandWindow( QWidget *parent ) : QMainWindow( parent ), ui( new Ui::N
|
||||
{
|
||||
ui->setupUi( this );
|
||||
ui->mainToolBar->setVisible( false );
|
||||
this->setWindowTitle( "NAND Extract r" + CleanSvnStr( SVN_REV_STR ) );
|
||||
this->setWindowTitle( "NAND Extract" );
|
||||
|
||||
//setup the block map
|
||||
SetUpBlockMap();
|
||||
|
@ -39,14 +39,3 @@ FORMS += mainwindow.ui \
|
||||
../WiiQt/settingtxtdialog.ui \
|
||||
newnandbin.ui
|
||||
RESOURCES += rc.qrc
|
||||
|
||||
|
||||
# create new svnrev.h
|
||||
unix {
|
||||
system( chmod 755 ../tools/makesvnrev.sh )
|
||||
system( ../tools/makesvnrev.sh )
|
||||
}
|
||||
|
||||
win32 {
|
||||
system( "..\\tools\\SubWCRev.exe" "." "..\\tools\\svnrev_template.h" ".\\svnrev.h" )
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user