summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
22 22
23include ( $(OPIEDIR)/include.pro ) 23include ( $(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
@@ -1,7 +1,7 @@
1 TEMPLATE= app 1TEMPLATE = app
2 CONFIG += qt warn_on 2CONFIG += qt warn_on
3 DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4 TARGET = sfcave-sdl 4TARGET = sfcave-sdl
5 5
6DEFINES = _REENTRANT main=SDL_main 6DEFINES = _REENTRANT main=SDL_main
7 7
@@ -9,47 +9,54 @@ INCLUDEPATH += $(OPIEDIR)/include
9INCLUDEPATH += $(OPIEDIR)/include/SDL 9INCLUDEPATH += $(OPIEDIR)/include/SDL
10DEPENDPATH += $(OPIEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11 11
12LIBS += -lqpe -L${SDLDIR}/lib -lSDL -lSDLmain -lSDL_gfx -lSDL_image -lSDL_mixer -lstdc++ 12LIBS += -lqpe -L${SDLDIR}/lib -lSDL -lSDLmain -lSDL_gfx -lSDL_image -lSDL_mixer -lstdc++
13 13
14 SOURCES = animatedimage.cpp \ 14SOURCES = animatedimage.cpp \
15 bfont.cpp \ 15 bfont.cpp \
16 font.cpp \ 16 font.cpp \
17 game.cpp \ 17 game.cpp \
18 menu.cpp \ 18 menu.cpp \
19 help.cpp \ 19 help.cpp \
20 player.cpp \ 20 player.cpp \
21 random.cpp \ 21 random.cpp \
22 sfcave.cpp \ 22 sfcave.cpp \
23 sfcave_game.cpp \ 23 sfcave_game.cpp \
24 gates_game.cpp \ 24 gates_game.cpp \
25 fly_game.cpp \ 25 fly_game.cpp \
26 flyterrain.cpp \ 26 flyterrain.cpp \
27 sound.cpp \ 27 sound.cpp \
28 terrain.cpp \ 28 terrain.cpp \
29 settings.cpp \ 29 settings.cpp \
30 starfield.cpp \ 30 starfield.cpp \
31 util.cpp 31 util.cpp
32 32
33 HEADERS = animatedimage.h \ 33HEADERS = animatedimage.h \
34 bfont.h \ 34 bfont.h \
35 constants.h \ 35 constants.h \
36 font.h \ 36 font.h \
37 game.h \ 37 game.h \
38 menu.h \ 38 menu.h \
39 player.h \ 39 player.h \
40 random.h \ 40 random.h \
41 rect.h \ 41 rect.h \
42 sfcave.h \ 42 sfcave.h \
43 help.h \ 43 help.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
55include ( $(OPIEDIR)/include.pro ) 55include ( $(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
@@ -1,22 +1,29 @@
1CONFIG = qt warn_on quick-app 1CONFIG = qt warn_on quick-app
2HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ 2HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \
3 videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ 3 videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
4 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ 4 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
5 alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \ 5 alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
6 skin.h 6 skin.h
7SOURCES = main.cpp \ 7SOURCES = main.cpp \
8 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ 8 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
9 videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ 9 videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
10 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ 10 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.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
15TARGET = opieplayer2 15TARGET = opieplayer2
16INCLUDEPATH += $(OPIEDIR)/include 16INCLUDEPATH += $(OPIEDIR)/include
17DEPENDPATH += $(OPIEDIR)/include 17DEPENDPATH += $(OPIEDIR)/include
18LIBS += -lqpe -lpthread -lopiecore2 -lxine -lstdc++ 18LIBS += -lqpe -lpthread -lopiecore2 -lxine -lstdc++
19MOC_DIR = qpeobj 19MOC_DIR = qpeobj
20OBJECTS_DIR = qpeobj 20OBJECTS_DIR = qpeobj
21 21
22include ( $(OPIEDIR)/include.pro ) 22include ( $(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
@@ -1,5 +1,5 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3 3
4HEADERS = mailwrapper.h \ 4HEADERS = mailwrapper.h \
5 imapwrapper.h \ 5 imapwrapper.h \
@@ -51,8 +51,8 @@ TARGET = mailwrapper
51include ( $(OPIEDIR)/include.pro ) 51include ( $(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
@@ -17,7 +17,7 @@ HEADERS = defines.h \
17 selectsmtp.h \ 17 selectsmtp.h \
18 nntpgroups.h \ 18 nntpgroups.h \
19 nntpgroupsdlg.h 19 nntpgroupsdlg.h
20 20
21SOURCES = main.cpp \ 21SOURCES = main.cpp \
22 opiemail.cpp \ 22 opiemail.cpp \
23 mainwindow.cpp \ 23 mainwindow.cpp \
@@ -36,7 +36,7 @@ SOURCES = main.cpp \
36 selectsmtp.cpp \ 36 selectsmtp.cpp \
37 nntpgroups.cpp \ 37 nntpgroups.cpp \
38 nntpgroupsdlg.cpp 38 nntpgroupsdlg.cpp
39 39
40INTERFACES = editaccountsui.ui \ 40INTERFACES = editaccountsui.ui \
41 selectmailtypeui.ui \ 41 selectmailtypeui.ui \
42 imapconfigui.ui \ 42 imapconfigui.ui \
@@ -50,7 +50,7 @@ INTERFACES = editaccountsui.ui \
50 newmaildirui.ui \ 50 newmaildirui.ui \
51 selectstoreui.ui \ 51 selectstoreui.ui \
52 nntpgroupsui.ui 52 nntpgroupsui.ui
53 53
54 54
55INCLUDEPATH += $(OPIEDIR)/include /usr/local/include 55INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
56 56
@@ -65,8 +65,8 @@ TARGET = opiemail
65 65
66include ( $(OPIEDIR)/include.pro ) 66include ( $(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}