Merge pull request #2 from zturtleman/fix_osx

Add missing project, fix Qt5, fix OS X
This commit is contained in:
Zachary J. Slater 2013-12-01 17:58:25 -08:00
commit 0872b6064f
3 changed files with 32 additions and 4 deletions

28
launch.pro Normal file
View file

@ -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

View file

@ -1,4 +1,4 @@
#include <QtGui/QApplication> #include <QApplication>
#include "mainwindow.h" #include "mainwindow.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])

View file

@ -28,10 +28,10 @@ void ioLaunch::on_btnLaunch_clicked()
ioq3 = path + "\\ioquake3.x86.exe +set r_mode -1"; ioq3 = path + "\\ioquake3.x86.exe +set r_mode -1";
} }
#elif Q_OS_X11 #elif defined Q_OS_X11
ioq3 = "ioquake3 +set r_mode -1"; ioq3 = "ioquake3 +set r_mode -1";
#elif Q_OS_MAC #elif defined Q_OS_MAC
ioq3 = "open -a ioquake3 +set r_mode -1"; ioq3 = "open -a ioquake3 --args +set r_mode -1";
#endif #endif