From ab2ebf754dce25f1ece1f0273044df8d014d742f Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 1 Dec 2013 19:49:45 -0600 Subject: [PATCH 1/2] Add project, fix building using Qt5 Project file based on @8bitprodigy's google code repo. --- launch.pro | 28 ++++++++++++++++++++++++++++ main.cpp | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 launch.pro diff --git a/launch.pro b/launch.pro new file mode 100644 index 0000000..022a533 --- /dev/null +++ b/launch.pro @@ -0,0 +1,28 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2012-08-06T14:25:21 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = launch +TEMPLATE = app + + +SOURCES += main.cpp\ + mainwindow.cpp + +HEADERS += mainwindow.h + +FORMS += mainwindow.ui + +OTHER_FILES += \ + README.md \ + iol.png \ + iolICO.png + +RESOURCES += \ + imgs.qrc diff --git a/main.cpp b/main.cpp index be7af75..036ffa4 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "mainwindow.h" int main(int argc, char *argv[]) From 27c6e285004c47559554776065483964b5593a35 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 1 Dec 2013 19:50:15 -0600 Subject: [PATCH 2/2] Fix compiling/running on OS X --- mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 100154c..d2fdcb1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -28,10 +28,10 @@ void ioLaunch::on_btnLaunch_clicked() ioq3 = path + "\\ioquake3.x86.exe +set r_mode -1"; } -#elif Q_OS_X11 +#elif defined Q_OS_X11 ioq3 = "ioquake3 +set r_mode -1"; -#elif Q_OS_MAC - ioq3 = "open -a ioquake3 +set r_mode -1"; +#elif defined Q_OS_MAC + ioq3 = "open -a ioquake3 --args +set r_mode -1"; #endif