author | ar <ar> | 2004-05-01 21:43:55 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-01 21:43:55 (UTC) |
commit | c3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (unidiff) | |
tree | 0766ac99f1e66b83beca222426e1a08faeff53c1 | |
parent | 8aa8b5166653d52f9623fbb1391d044916a2a260 (diff) | |
download | opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.zip opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.gz opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.bz2 |
- use lib and inlcude dir from dependencies before the other dir's
-rw-r--r-- | noncore/apps/dagger/dagger.pro | 6 | ||||
-rw-r--r-- | noncore/games/sfcave-sdl/sfcave-sdl.pro | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 7 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.pro | 4 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 4 |
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 | |||
@@ -13,12 +13,18 @@ HEADERS = mainwindow.h \ | |||
13 | opentextdlg.h \ | 13 | opentextdlg.h \ |
14 | configuredlg.h \ | 14 | configuredlg.h \ |
15 | textwidget.h \ | 15 | textwidget.h \ |
16 | swordoptionlist.h | 16 | swordoptionlist.h |
17 | 17 | ||
18 | TARGET = dagger | 18 | TARGET = dagger |
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH += $(OPIEDIR)/include | 20 | DEPENDPATH += $(OPIEDIR)/include |
21 | LIBS += -lopiecore2 -lopieui2 -lqpe -lsword | 21 | LIBS += -lopiecore2 -lopieui2 -lqpe -lsword |
22 | 22 | ||
23 | include ( $(OPIEDIR)/include.pro ) | 23 | include ( $(OPIEDIR)/include.pro ) |
24 | 24 | ||
25 | !isEmpty( LIBSWORD_INC_DIR ) { | ||
26 | INCLUDEPATH = $$LIBSWORD_INC_DIR $$INCLUDEPATH | ||
27 | } | ||
28 | !isEmpty( LIBSWORD_LIB_DIR ) { | ||
29 | LIBS = -L$$LIBSWORD_LIB_DIR $$LIBS | ||
30 | } | ||
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 | |||
@@ -44,12 +44,19 @@ HEADERS = animatedimage.h \ | |||
44 | sfcave_game.h \ | 44 | sfcave_game.h \ |
45 | gates_game.h \ | 45 | gates_game.h \ |
46 | fly_game.h \ | 46 | fly_game.h \ |
47 | flyterrain.h \ | 47 | flyterrain.h \ |
48 | sound.h \ | 48 | sound.h \ |
49 | terrain.h \ | 49 | terrain.h \ |
50 | stringtokenizer.h \ | 50 | stringtokenizer.h \ |
51 | settings.h \ | 51 | settings.h \ |
52 | starfield.h \ | 52 | starfield.h \ |
53 | util.h | 53 | util.h |
54 | 54 | ||
55 | include ( $(OPIEDIR)/include.pro ) | 55 | include ( $(OPIEDIR)/include.pro ) |
56 | |||
57 | !isEmpty( LIBSDL_INC_DIR ) { | ||
58 | INCLUDEPATH = $$LIBSDL_INC_DIR $$INCLUDEPATH | ||
59 | } | ||
60 | !isEmpty( LIBSDL_LIB_DIR ) { | ||
61 | LIBS = -L$$LIBSDL_LIB_DIR $$LIBS | ||
62 | } | ||
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 | |||
@@ -11,12 +11,19 @@ SOURCES = main.cpp \ | |||
11 | playlistwidgetgui.cpp\ | 11 | playlistwidgetgui.cpp\ |
12 | alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \ | 12 | alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \ |
13 | threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \ | 13 | threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \ |
14 | skin.cpp | 14 | skin.cpp |
15 | TARGET = opieplayer2 | 15 | TARGET = opieplayer2 |
16 | INCLUDEPATH += $(OPIEDIR)/include | 16 | INCLUDEPATH += $(OPIEDIR)/include |
17 | DEPENDPATH += $(OPIEDIR)/include | 17 | DEPENDPATH += $(OPIEDIR)/include |
18 | LIBS += -lqpe -lpthread -lopiecore2 -lxine -lstdc++ | 18 | LIBS += -lqpe -lpthread -lopiecore2 -lxine -lstdc++ |
19 | MOC_DIR = qpeobj | 19 | MOC_DIR = qpeobj |
20 | OBJECTS_DIR = qpeobj | 20 | OBJECTS_DIR = qpeobj |
21 | 21 | ||
22 | include ( $(OPIEDIR)/include.pro ) | 22 | include ( $(OPIEDIR)/include.pro ) |
23 | |||
24 | !isEmpty( LIBXINE_INC_DIR ) { | ||
25 | INCLUDEPATH = $$LIBXINE_INC_DIR $$INCLUDEPATH | ||
26 | } | ||
27 | !isEmpty( LIBXINE_LIB_DIR ) { | ||
28 | LIBS = -L$$LIBXINE_LIB_DIR $$LIBS | ||
29 | } | ||
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 | |||
@@ -42,17 +42,17 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
42 | LIBS += -lqpe -letpan -lssl -lcrypto | 42 | LIBS += -lqpe -letpan -lssl -lcrypto |
43 | 43 | ||
44 | contains( $(CONFIG_TARGET_MACOSX), y ){ | 44 | contains( $(CONFIG_TARGET_MACOSX), y ){ |
45 | LIBS += -liconv | 45 | LIBS += -liconv |
46 | } | 46 | } |
47 | 47 | ||
48 | DESTDIR = $(OPIEDIR)/lib | 48 | DESTDIR = $(OPIEDIR)/lib |
49 | TARGET = mailwrapper | 49 | TARGET = mailwrapper |
50 | 50 | ||
51 | include ( $(OPIEDIR)/include.pro ) | 51 | include ( $(OPIEDIR)/include.pro ) |
52 | 52 | ||
53 | !isEmpty( LIBETPAN_INC_DIR ) { | 53 | !isEmpty( LIBETPAN_INC_DIR ) { |
54 | INCLUDEPATH += $$LIBETPAN_INC_DIR | 54 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
55 | } | 55 | } |
56 | !isEmpty( LIBETPAN_LIB_DIR ) { | 56 | !isEmpty( LIBETPAN_LIB_DIR ) { |
57 | LIBS += -L$$LIBETPAN_LIB_DIR | 57 | LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS |
58 | } | 58 | } |
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 | |||
@@ -56,17 +56,17 @@ INCLUDEPATH += $(OPIEDIR)/include /usr/local/include | |||
56 | 56 | ||
57 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 57 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
58 | contains( CONFTEST, y ){ | 58 | contains( CONFTEST, y ){ |
59 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2 | 59 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2 |
60 | }else{ | 60 | }else{ |
61 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2 | 61 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2 |
62 | } | 62 | } |
63 | 63 | ||
64 | TARGET = opiemail | 64 | TARGET = opiemail |
65 | 65 | ||
66 | include ( $(OPIEDIR)/include.pro ) | 66 | include ( $(OPIEDIR)/include.pro ) |
67 | !isEmpty( LIBETPAN_INC_DIR ) { | 67 | !isEmpty( LIBETPAN_INC_DIR ) { |
68 | INCLUDEPATH += $$LIBETPAN_INC_DIR | 68 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
69 | } | 69 | } |
70 | !isEmpty( LIBETPAN_LIB_DIR ) { | 70 | !isEmpty( LIBETPAN_LIB_DIR ) { |
71 | LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR | 71 | LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS |
72 | } | 72 | } |