summaryrefslogtreecommitdiff
path: root/noncore
authorar <ar>2004-05-01 21:43:55 (UTC)
committer ar <ar>2004-05-01 21:43:55 (UTC)
commitc3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (side-by-side diff)
tree0766ac99f1e66b83beca222426e1a08faeff53c1 /noncore
parent8aa8b5166653d52f9623fbb1391d044916a2a260 (diff)
downloadopie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.zip
opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.gz
opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.bz2
- use lib and inlcude dir from dependencies before the other dir's
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/dagger/dagger.pro6
-rw-r--r--noncore/games/sfcave-sdl/sfcave-sdl.pro95
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro19
-rw-r--r--noncore/net/mail/libmailwrapper/libmailwrapper.pro6
-rw-r--r--noncore/net/mail/mail.pro10
5 files changed, 78 insertions, 58 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
@@ -22,3 +22,9 @@ 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,7 +1,7 @@
-TEMPLATE = app
-CONFIG += qt warn_on
-DESTDIR = $(OPIEDIR)/bin
-TARGET = sfcave-sdl
+TEMPLATE = app
+CONFIG += qt warn_on
+DESTDIR = $(OPIEDIR)/bin
+TARGET = sfcave-sdl
DEFINES = _REENTRANT main=SDL_main
@@ -9,47 +9,54 @@ INCLUDEPATH += $(OPIEDIR)/include
INCLUDEPATH += $(OPIEDIR)/include/SDL
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -L${SDLDIR}/lib -lSDL -lSDLmain -lSDL_gfx -lSDL_image -lSDL_mixer -lstdc++
+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
+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
+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 \
+ 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
+ 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\
+ playlistwidgetgui.cpp\
alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \
- threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
- skin.cpp
+ threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
+ skin.cpp
TARGET = opieplayer2
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += $(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,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on
+CONFIG += qt warn_on
HEADERS = mailwrapper.h \
imapwrapper.h \
@@ -51,8 +51,8 @@ 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
@@ -17,7 +17,7 @@ HEADERS = defines.h \
selectsmtp.h \
nntpgroups.h \
nntpgroupsdlg.h
-
+
SOURCES = main.cpp \
opiemail.cpp \
mainwindow.cpp \
@@ -36,7 +36,7 @@ SOURCES = main.cpp \
selectsmtp.cpp \
nntpgroups.cpp \
nntpgroupsdlg.cpp
-
+
INTERFACES = editaccountsui.ui \
selectmailtypeui.ui \
imapconfigui.ui \
@@ -50,7 +50,7 @@ INTERFACES = editaccountsui.ui \
newmaildirui.ui \
selectstoreui.ui \
nntpgroupsui.ui
-
+
INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
@@ -65,8 +65,8 @@ 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
}