finaly our install system should do clean setups into the corect directorys (at least for unix, yet)
This commit is contained in:
parent
71d3ae3b19
commit
7d0fe226b8
|
@ -13,10 +13,7 @@ DESTDIR= ../../deploy/libs
|
|||
|
||||
|
||||
|
||||
QXTUNIXPREFIX=/usr
|
||||
|
||||
|
||||
#keep macx at the bottom. unix is defined too!
|
||||
unix :QXTINSTALLDIR=/opt/qxt
|
||||
unix :QXTINSTALLDIR=/usr
|
||||
win32:QXTINSTALLDIR=C:\libqxt
|
||||
macx :QXTINSTALLDIR=/Library/Frameworks/
|
||||
|
|
13
config.pri
13
config.pri
|
@ -5,14 +5,15 @@
|
|||
|
||||
|
||||
|
||||
#where to install qxt(default is /opt/qxt on unix , C:\libqxt on windows , and /Library/Frameworks on mac)
|
||||
#install prefix / dir
|
||||
#
|
||||
#on Windows qxt will be fully installed to that directory (default is to C:\libqxt)
|
||||
#on Unix qxt will be installed in $QXTINSTALLDIR/lib/ $QXTINSTALLDIR/include $QXTINSTALLDIR/doc/libqxt/ $QXTINSTALLDIR/bin/ (default is /usr)
|
||||
#on mac the behaiviour is not tested (should install everyhting to /Library/Frameworks by default)
|
||||
|
||||
#QXTINSTALLDIR=/opt/qxt
|
||||
#QXTINSTALLDIR=/usr
|
||||
|
||||
#QXTUNIXPREFIX=/usr
|
||||
|
||||
|
||||
#modules (core kit gui network sql media)
|
||||
#modules (core kit gui network sql media mox)
|
||||
|
||||
#QXT -= media
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
unix:MOX=$$[QT_INSTALL_DATA]/bin/mox
|
||||
win32:MOX=$$[QT_INSTALL_DATA]/bin/mox.exe
|
||||
CONFIG+=qxt
|
||||
|
||||
unix:MOX=$${QXTbin}/mox
|
||||
win32:MOX=$${QXTbin}/mox.exe
|
||||
|
||||
|
||||
mox.target = mox_metaball$${first(QMAKE_EXT_H)}
|
||||
mox.output = mox_metaball$${first(QMAKE_EXT_H)}
|
|
@ -1,25 +1,20 @@
|
|||
|
||||
|
||||
isEmpty(QXTbase){
|
||||
unix : QXTbase=/opt/qxt
|
||||
unix : QXTbase=/usr
|
||||
win32: QXTbase=C:/libqxt
|
||||
macx :
|
||||
}
|
||||
isEmpty(QXTinclude){
|
||||
unix : QXTinclude=/usr/include
|
||||
win32: QXTinclude=$${QXTbase}/src
|
||||
macx :
|
||||
}
|
||||
isEmpty(QXTbin){
|
||||
unix : QXTbin=/usr/lib
|
||||
win32: QXTbin=$${QXTbase}/bin
|
||||
macx :
|
||||
}
|
||||
|
||||
isEmpty(QXTlib): QXTlib=$${QXTbase}/lib
|
||||
isEmpty(QXTinclude): QXTinclude=$${QXTbase}/include
|
||||
isEmpty(QXTbin): QXTbin=$${QXTbase}/lib
|
||||
|
||||
|
||||
|
||||
|
||||
INCLUDEPATH+=$${QXTinclude}
|
||||
LIBS += -Wl,-rpath,$${QXTbin} -L$${QXTbin}
|
||||
LIBS += -Wl,-rpath,$${QXTlib} -L$${QXTlib}
|
||||
|
||||
|
||||
contains(QXT, kit ){
|
|
@ -1,5 +1,7 @@
|
|||
HEADERS += ../../src/media/QxtSdlWidget.h MySdlWidget.h
|
||||
SOURCES += ../../src/media/QxtSdlWidget.cpp MySdlWidget.cpp main.cpp
|
||||
HEADERS += MySdlWidget.h
|
||||
SOURCES += MySdlWidget.cpp main.cpp
|
||||
CONFIG += qxt
|
||||
QXT += media
|
||||
INCLUDEPATH += . $$system(sdl-config --cflags | sed -e 's/-I//g')
|
||||
LIBS += $$system(sdl-config --libs) -lSDL_image
|
||||
DESTDIR = .
|
||||
|
|
36
libqxt.pro
36
libqxt.pro
|
@ -21,29 +21,33 @@
|
|||
include (config.pri)
|
||||
TEMPLATE = subdirs
|
||||
|
||||
base.path = $${QXTINSTALLDIR}
|
||||
base.files = *
|
||||
|
||||
unix : docs.path = $${QXTUNIXPREFIX}/doc/qxt
|
||||
win32: docs.path =
|
||||
macx : docs.path =
|
||||
|
||||
unix : docs.path = $${QXTINSTALLDIR}/doc/libqxt
|
||||
win32: docs.path = $${QXTINSTALLDIR}/docs
|
||||
macx : docs.path = $${QXTINSTALLDIR}/docs
|
||||
docs.files = deploy/docs/*
|
||||
|
||||
|
||||
unix : bin.path = $${QXTUNIXPREFIX}/lib
|
||||
win32: bin.path =
|
||||
macx : bin.path =
|
||||
bin.files = deploy/libs/*
|
||||
unix : lib.path = $${QXTINSTALLDIR}/lib
|
||||
win32: lib.path = $${QXTINSTALLDIR}/lib
|
||||
macx : lib.path = $${QXTINSTALLDIR}/lib
|
||||
lib.files = deploy/libs/*
|
||||
|
||||
|
||||
unix : include.path = $${QXTUNIXPREFIX}/include/qxt
|
||||
win32: include.path =
|
||||
macx : include.path =
|
||||
unix : include.path = $${QXTINSTALLDIR}/include/qxt
|
||||
win32: include.path = $${QXTINSTALLDIR}/include
|
||||
macx : include.path = $${QXTINSTALLDIR}/include
|
||||
include.files = src/QxtDefines.h src/Qxt.h
|
||||
|
||||
unix : bin.path = $${QXTINSTALLDIR}/bin
|
||||
win32: bin.path = $${QXTINSTALLDIR}/bin
|
||||
macx : bin.path = $${QXTINSTALLDIR}/bin
|
||||
bin.files =
|
||||
|
||||
|
||||
#write the paths to prf file
|
||||
unix :system((echo QXTbase=$${QXTINSTALLDIR}; echo QXTinclude=$${include.path}; echo QXTbin=$${bin.path}; cat deploy/qt/qxt.prf.m) > deploy/qt/qxt.prf)
|
||||
unix :system((echo QXTbase=$${QXTINSTALLDIR}; echo QXTinclude=$${include.path}; echo QXTbin=$${bin.path}; echo QXTlib=$${lib.path}; cat deploy/qt/qxt.prf.m) > deploy/qt/qxt.prf)
|
||||
win32:system(move deploy/qt/qxt.prf.m deploy/qt/qxt.prf) #TODO HANDLE IT!
|
||||
|
||||
|
||||
|
@ -51,7 +55,7 @@ win32:system(move deploy/qt/qxt.prf.m deploy/qt/qxt.prf) #TODO HANDLE IT!
|
|||
|
||||
|
||||
features.path = $$[QT_INSTALL_DATA]/mkspecs/features
|
||||
features.files = deploy/*.prf
|
||||
features.files = deploy/qt/*.prf
|
||||
|
||||
|
||||
|
||||
|
@ -60,7 +64,7 @@ features.files = deploy/*.prf
|
|||
|
||||
|
||||
|
||||
INSTALLS = base docs bin include features
|
||||
INSTALLS = lib docs bin include features
|
||||
|
||||
|
||||
|
||||
|
@ -124,7 +128,7 @@ contains( QXT, mox ){
|
|||
SUBDIRS += mox
|
||||
unix:mox.files += deploy/bin/mox
|
||||
win32:mox.files += deploy/bin/mox.exe
|
||||
mox.path = $$[QT_INSTALL_DATA]/bin/
|
||||
mox.path = $${bin.path}
|
||||
INSTALLS += mox
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QStringList>
|
||||
#include <iostream>
|
||||
#include <QFile>
|
||||
|
@ -8,7 +8,7 @@
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QApplication app (argc,argv);
|
||||
QCoreApplication app (argc,argv);
|
||||
|
||||
if (app.arguments().size()<2 || app.arguments()[1]=="-h" || app.arguments()[1]=="--help")
|
||||
{
|
||||
|
|
|
@ -4,6 +4,7 @@ DESTDIR= ../deploy/bin
|
|||
VERSION = $$QXVERSION
|
||||
TEMPLATE = app
|
||||
TARGET = mox
|
||||
QT=core
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += . ..
|
||||
SOURCES += main.cpp
|
||||
|
|
Loading…
Reference in New Issue
Block a user