summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/dagger/dagger.pro6
-rw-r--r--noncore/games/sfcave-sdl/sfcave-sdl.pro7
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro7
-rw-r--r--noncore/net/mail/libmailwrapper/libmailwrapper.pro4
-rw-r--r--noncore/net/mail/mail.pro4
5 files changed, 24 insertions, 4 deletions
diff --git a/noncore/apps/dagger/dagger.pro b/noncore/apps/dagger/dagger.pro
index 96aeef9..d697669 100644
--- a/noncore/apps/dagger/dagger.pro
+++ b/noncore/apps/dagger/dagger.pro
@@ -1,24 +1,30 @@
CONFIG = qt warn_on quick-app
SOURCES = mainwindow.cpp \
navbar.cpp \
searchbar.cpp \
opentextdlg.cpp \
configuredlg.cpp \
textwidget.cpp \
main.cpp
HEADERS = mainwindow.h \
navbar.h \
searchbar.h \
opentextdlg.h \
configuredlg.h \
textwidget.h \
swordoptionlist.h
TARGET = dagger
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lopiecore2 -lopieui2 -lqpe -lsword
include ( $(OPIEDIR)/include.pro )
+!isEmpty( LIBSWORD_INC_DIR ) {
+ INCLUDEPATH = $$LIBSWORD_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBSWORD_LIB_DIR ) {
+ LIBS = -L$$LIBSWORD_LIB_DIR $$LIBS
+}
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.pro b/noncore/games/sfcave-sdl/sfcave-sdl.pro
index 2d4dcf1..8372919 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.pro
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.pro
@@ -1,55 +1,62 @@
TEMPLATE = app
CONFIG += qt warn_on
DESTDIR = $(OPIEDIR)/bin
TARGET = sfcave-sdl
DEFINES = _REENTRANT main=SDL_main
INCLUDEPATH += $(OPIEDIR)/include
INCLUDEPATH += $(OPIEDIR)/include/SDL
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -L${SDLDIR}/lib -lSDL -lSDLmain -lSDL_gfx -lSDL_image -lSDL_mixer -lstdc++
SOURCES = animatedimage.cpp \
bfont.cpp \
font.cpp \
game.cpp \
menu.cpp \
help.cpp \
player.cpp \
random.cpp \
sfcave.cpp \
sfcave_game.cpp \
gates_game.cpp \
fly_game.cpp \
flyterrain.cpp \
sound.cpp \
terrain.cpp \
settings.cpp \
starfield.cpp \
util.cpp
HEADERS = animatedimage.h \
bfont.h \
constants.h \
font.h \
game.h \
menu.h \
player.h \
random.h \
rect.h \
sfcave.h \
help.h \
sfcave_game.h \
gates_game.h \
fly_game.h \
flyterrain.h \
sound.h \
terrain.h \
stringtokenizer.h \
settings.h \
starfield.h \
util.h
include ( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBSDL_INC_DIR ) {
+ INCLUDEPATH = $$LIBSDL_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBSDL_LIB_DIR ) {
+ LIBS = -L$$LIBSDL_LIB_DIR $$LIBS
+}
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 15f7d61..9388496 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,22 +1,29 @@
CONFIG = qt warn_on quick-app
HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \
videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
skin.h
SOURCES = main.cpp \
playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
playlistwidgetgui.cpp\
alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \
threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
skin.cpp
TARGET = opieplayer2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread -lopiecore2 -lxine -lstdc++
MOC_DIR = qpeobj
OBJECTS_DIR = qpeobj
include ( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBXINE_INC_DIR ) {
+ INCLUDEPATH = $$LIBXINE_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBXINE_LIB_DIR ) {
+ LIBS = -L$$LIBXINE_LIB_DIR $$LIBS
+}
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index 5e44064..befadd7 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -1,58 +1,58 @@
TEMPLATE = lib
CONFIG += qt warn_on
HEADERS = mailwrapper.h \
imapwrapper.h \
mailtypes.h \
pop3wrapper.h \
abstractmail.h \
smtpwrapper.h \
genericwrapper.h \
mboxwrapper.h \
settings.h \
logindialog.h \
sendmailprogress.h \
statusmail.h \
mhwrapper.h \
nntpwrapper.h \
generatemail.h \
storemail.h
SOURCES = imapwrapper.cpp \
mailwrapper.cpp \
mailtypes.cpp \
pop3wrapper.cpp \
abstractmail.cpp \
smtpwrapper.cpp \
genericwrapper.cpp \
mboxwrapper.cpp \
settings.cpp \
logindialog.cpp \
sendmailprogress.cpp \
statusmail.cpp \
mhwrapper.cpp \
nntpwrapper.cpp \
generatemail.cpp \
storemail.cpp
INTERFACES = logindialogui.ui \
sendmailprogressui.ui
INCLUDEPATH += $(OPIEDIR)/include
LIBS += -lqpe -letpan -lssl -lcrypto
contains( $(CONFIG_TARGET_MACOSX), y ){
LIBS += -liconv
}
DESTDIR = $(OPIEDIR)/lib
TARGET = mailwrapper
include ( $(OPIEDIR)/include.pro )
!isEmpty( LIBETPAN_INC_DIR ) {
- INCLUDEPATH += $$LIBETPAN_INC_DIR
+ INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
}
!isEmpty( LIBETPAN_LIB_DIR ) {
- LIBS += -L$$LIBETPAN_LIB_DIR
+ LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS
}
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index a3328cb..c88923f 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,72 +1,72 @@
CONFIG += qt warn_on quick-app
HEADERS = defines.h \
editaccounts.h \
composemail.h \
accountview.h \
accountitem.h \
mainwindow.h \
viewmail.h \
viewmailbase.h \
opiemail.h \
mailistviewitem.h \
settingsdialog.h \
statuswidget.h \
newmaildir.h \
selectstore.h \
selectsmtp.h \
nntpgroups.h \
nntpgroupsdlg.h
SOURCES = main.cpp \
opiemail.cpp \
mainwindow.cpp \
accountview.cpp \
accountitem.cpp \
composemail.cpp \
addresspicker.cpp \
editaccounts.cpp \
viewmail.cpp \
viewmailbase.cpp \
mailistviewitem.cpp \
settingsdialog.cpp \
statuswidget.cpp \
newmaildir.cpp \
selectstore.cpp \
selectsmtp.cpp \
nntpgroups.cpp \
nntpgroupsdlg.cpp
INTERFACES = editaccountsui.ui \
selectmailtypeui.ui \
imapconfigui.ui \
pop3configui.ui \
nntpconfigui.ui \
smtpconfigui.ui \
addresspickerui.ui \
composemailui.ui \
settingsdialogui.ui \
statuswidgetui.ui \
newmaildirui.ui \
selectstoreui.ui \
nntpgroupsui.ui
INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
contains( CONFTEST, y ){
LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2
}else{
LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2
}
TARGET = opiemail
include ( $(OPIEDIR)/include.pro )
!isEmpty( LIBETPAN_INC_DIR ) {
- INCLUDEPATH += $$LIBETPAN_INC_DIR
+ INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
}
!isEmpty( LIBETPAN_LIB_DIR ) {
- LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR
+ LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
}