branches/work/kst/portto4/kst
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
branches/work/kst/portto4/kst
by Bugzilla from netterfield@astro.utoronto.ca
::
Rate this Message:
SVN commit 1035837 by netterfield:
Build changes from beta 3 M +3 -2 dataobjectplugin.pri M +1 -1 datasourceplugin.pri M +2 -2 src/d2asc/d2asc.pro M +2 -2 src/d2d/d2d.pro M +1 -1 src/datasources/ascii/ascii.pro M +1 -1 src/datasources/dirfilesource/dirfilesource.pro M +2 -2 src/datasources/fitsimage/fitsimage.pro M +2 -2 src/datasources/healpix/healpix.pro M +2 -2 src/datasources/lfiio/lfiio.pro M +2 -2 src/datasources/planckIDEF/planckIDEF.pro M +2 -2 src/datasources/qimagesource/qimagesource.pro M +2 -2 src/datasources/sampledatasource/sampledatasource.pro M +2 -2 src/kst/kst.pro M +1 -1 src/libkst/libkst.pro M +7 -7 src/libkstapp/libkstapp.pro M +2 -2 src/libkstmath/libkstmath.pro M +5 -5 src/widgets/widgets.pro M +2 -2 tests/tests.pro --- branches/work/kst/portto4/kst/dataobjectplugin.pri #1035836:1035837 @@ -18,5 +18,6 @@ $$TOPLEVELDIR/src/widgets \ $$OUTPUT_DIR/src/widgets \ -win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkstapp -lkstwidgets -lkstmath -lkst -!win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst -lkstmath -lkstwidgets -lkstapp +win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst2app -lkst2widgets -lkst2math -lkst2 +!win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst2 -lkst2math -lkst2widgets -lkst2app + --- branches/work/kst/portto4/kst/datasourceplugin.pri #1035836:1035837 @@ -15,4 +15,4 @@ tmp \ $$TOPLEVELDIR/src/libkst -LIBS += -L$$OUTPUT_DIR/lib -lkst +LIBS += -L$$OUTPUT_DIR/lib -lkst2 --- branches/work/kst/portto4/kst/src/d2asc/d2asc.pro #1035836:1035837 @@ -12,8 +12,8 @@ $$TOPLEVELDIR/src/libkstapp \ $$OUTPUT_DIR/src/kst/tmp -win32:LIBS += -lkstapp -lkstwidgets -lkstmath -lkst -!win32:LIBS += -lkst -lkstmath -lkstwidgets -lkstapp +win32:LIBS += -lkst2app -lkst2widgets -lkst2math -lkst2 +!win32:LIBS += -lkst2 -lkst2math -lkst2widgets -lkst2app SOURCES += \ d2asc.cpp --- branches/work/kst/portto4/kst/src/d2d/d2d.pro #1035836:1035837 @@ -12,8 +12,8 @@ $$TOPLEVELDIR/src/libkstapp \ $$OUTPUT_DIR/src/kst/tmp -win32:LIBS += -lkstapp -lkstwidgets -lkstmath -lkst -!win32:LIBS += -lkst -lkstmath -lkstwidgets -lkstapp +win32:LIBS += -lkst2app -lkst2widgets -lkst2math -lkst2 +!win32:LIBS += -lkst2 -lkst2math -lkst2widgets -lkst2app SOURCES += \ d2d.cpp --- branches/work/kst/portto4/kst/src/datasources/ascii/ascii.pro #1035836:1035837 @@ -1,6 +1,6 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_ascii +TARGET = kst2data_ascii INCLUDEPATH += $$OUTPUT_DIR/src/datasources/ascii/tmp SOURCES += ascii.cpp HEADERS += ascii.h \ --- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_dirfilesource +TARGET = kst2data_dirfilesource INCLUDEPATH += $$OUTPUT_DIR/src/datasources/dirfilesource/tmp --- branches/work/kst/portto4/kst/src/datasources/fitsimage/fitsimage.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_fitsimage +TARGET = kst2data_fitsimage INCLUDEPATH += $$OUTPUT_DIR/src/datasources/fitsimage/tmp @@ -11,4 +11,4 @@ fitsimage.cpp HEADERS += \ - fitsimage.h \ No newline at end of file + fitsimage.h --- branches/work/kst/portto4/kst/src/datasources/healpix/healpix.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_healpix +TARGET = kst2data_healpix INCLUDEPATH += $$OUTPUT_DIR/src/datasources/fitsimage/tmp @@ -17,4 +17,4 @@ healpix.h \ healpix_tools.h -FORMS += healpixconfig.ui \ No newline at end of file +FORMS += healpixconfig.ui --- branches/work/kst/portto4/kst/src/datasources/lfiio/lfiio.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_lfiio +TARGET = kst2data_lfiio INCLUDEPATH += $$OUTPUT_DIR/src/datasources/lfiio/tmp @@ -11,4 +11,4 @@ lfiio.cpp HEADERS += \ - lfiio.h \ No newline at end of file + lfiio.h --- branches/work/kst/portto4/kst/src/datasources/planckIDEF/planckIDEF.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_planckIDEF +TARGET = kst2data_planckIDEF INCLUDEPATH += $$OUTPUT_DIR/src/datasources/fitsimage/tmp @@ -13,4 +13,4 @@ HEADERS += \ planckIDEF.h -FORMS += planckIDEFconfig.ui \ No newline at end of file +FORMS += planckIDEFconfig.ui --- branches/work/kst/portto4/kst/src/datasources/qimagesource/qimagesource.pro #1035836:1035837 @@ -1,11 +1,11 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_qimagesource +TARGET = kst2data_qimagesource INCLUDEPATH += $$OUTPUT_DIR/src/datasources/qimagesource/tmp SOURCES += \ qimagesource.cpp HEADERS += \ - qimagesource.h \ No newline at end of file + qimagesource.h --- branches/work/kst/portto4/kst/src/datasources/sampledatasource/sampledatasource.pro #1035836:1035837 @@ -1,11 +1,11 @@ include($$PWD/../../../kst.pri) include($$PWD/../../../datasourceplugin.pri) -TARGET = kstdata_sampledatasource +TARGET = kst2data_sampledatasource INCLUDEPATH += $$OUTPUT_DIR/src/datasources/sampledatasource/tmp SOURCES += \ sampledatasource.cpp HEADERS += \ - sampledatasource.h \ No newline at end of file + sampledatasource.h --- branches/work/kst/portto4/kst/src/kst/kst.pro #1035836:1035837 @@ -17,8 +17,8 @@ $$TOPLEVELDIR/src/libkstapp \ $$OUTPUT_DIR/src/kst/tmp -win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkstapp -lkstwidgets -lkstmath -lkst -!win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst -lkstmath -lkstwidgets -lkstapp +win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst2app -lkst2widgets -lkst2math -lkst2 +!win32:LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst2 -lkst2math -lkst2widgets -lkst2app SOURCES += \ main.cpp --- branches/work/kst/portto4/kst/src/libkst/libkst.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../kst.pri) TEMPLATE = lib -TARGET = kst +TARGET = kst2 DESTDIR = $$OUTPUT_DIR/lib win32:CONFIG += staticlib --- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #1035836:1035837 @@ -4,7 +4,7 @@ svg \ opengl TEMPLATE = lib -TARGET = kstapp +TARGET = kst2app DESTDIR = $$OUTPUT_DIR/lib win32:CONFIG += staticlib !isEmpty(INSTALL_PREFIX) { @@ -19,14 +19,14 @@ $$OUTPUT_DIR/src/libkstapp/tmp win32:LIBS += -L$$OUTPUT_DIR/lib \ -L$$OUTPUT_DIR/plugin \ - -lkstwidgets \ - -lkstmath \ - -lkst + -lkst2widgets \ + -lkst2math \ + -lkst2 !win32:LIBS += -L$$OUTPUT_DIR/lib \ -L$$OUTPUT_DIR/plugin \ - -lkst \ - -lkstmath \ - -lkstwidgets + -lkst2 \ + -lkst2math \ + -lkst2widgets SOURCES += aboutdialog.cpp \ application.cpp \ applicationsettings.cpp \ --- branches/work/kst/portto4/kst/src/libkstmath/libkstmath.pro #1035836:1035837 @@ -1,7 +1,7 @@ include($$PWD/../../kst.pri) TEMPLATE = lib -TARGET = kstmath +TARGET = kst2math DESTDIR = $$OUTPUT_DIR/lib win32:CONFIG += staticlib @@ -15,7 +15,7 @@ $$TOPLEVELDIR/src/libkst \ $$OUTPUT_DIR/src/libkstmath/tmp -LIBS += -L$$OUTPUT_DIR/lib -lkst +LIBS += -L$$OUTPUT_DIR/lib -lkst2 #Don't trigger qmake's lex/yacc handling by default. #Rather we want to use the files that are pre-generated and checked in. --- branches/work/kst/portto4/kst/src/widgets/widgets.pro #1035836:1035837 @@ -4,7 +4,7 @@ TEMPLATE = lib CONFIG += designer -TARGET = kstwidgets +TARGET = kst2widgets DESTDIR = $$OUTPUT_DIR/lib win32:CONFIG += staticlib !isEmpty(INSTALL_PREFIX) { @@ -17,12 +17,12 @@ $$OUTPUT_DIR/src/widgets/tmp win32:LIBS += -L$$OUTPUT_DIR/lib \ -L$$OUTPUT_DIR/plugin \ - -lkstmath \ - -lkst + -lkst2math \ + -lkst2 !win32:LIBS += -L$$OUTPUT_DIR/lib \ -L$$OUTPUT_DIR/plugin \ - -lkst \ - -lkstmath + -lkst2 \ + -lkst2math SOURCES += \ colorbutton.cpp \ --- branches/work/kst/portto4/kst/tests/tests.pro #1035836:1035837 @@ -18,8 +18,8 @@ $$TOPLEVELDIR/src/libkstapp \ $$OUTPUT_DIR/src/kst/tmp -win32:LIBS += -lkstapp -lkstwidgets -lkstmath -lkst -!win32:LIBS += -lkst -lkstmath -lkstwidgets -lkstapp +win32:LIBS += -lkst2app -lkst2widgets -lkst2math -lkst2 +!win32:LIBS += -lkst2 -lkst2math -lkst2widgets -lkst2app SOURCES += \ main.cpp \ _______________________________________________ Kst mailing list Kst@... https://mail.kde.org/mailman/listinfo/kst |
| Free embeddable forum powered by Nabble | Forum Help |
