author | simon <simon> | 2003-04-20 10:21:23 (UTC) |
---|---|---|
committer | simon <simon> | 2003-04-20 10:21:23 (UTC) |
commit | cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486 (patch) (unidiff) | |
tree | e731ac81737e26369b5060d58761590acbe279ed /noncore | |
parent | b2583563a61e1ac1d9207fb3c008443a5fc7dc3c (diff) | |
download | opie-cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486.zip opie-cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486.tar.gz opie-cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486.tar.bz2 |
- these apps need libstdc++ when built with a 3.2 toolchain
-rw-r--r-- | noncore/multimedia/opierec/opierec.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro index 00a366d..3447f99 100644 --- a/noncore/multimedia/opierec/opierec.pro +++ b/noncore/multimedia/opierec/opierec.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | #CONFIG = qt warn_on debug | 2 | #CONFIG = qt warn_on debug |
3 | CONFIG = qt warn_on release | 3 | CONFIG = qt warn_on release |
4 | HEADERS = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h | 4 | HEADERS = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h |
5 | SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp | 5 | SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += $(OPIEDIR)/include | 7 | DEPENDPATH += $(OPIEDIR)/include |
8 | LIBS += -lqpe -lpthread | 8 | LIBS += -lqpe -lstdc++ -lpthread |
9 | INTERFACES = | 9 | INTERFACES = |
10 | TARGET = opierec | 10 | TARGET = opierec |
11 | DESTDIR = $(OPIEDIR)/bin | 11 | DESTDIR = $(OPIEDIR)/bin |
12 | #TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti | 12 | #TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti |
13 | include ( $(OPIEDIR)/include.pro ) | 13 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 08eb18a..476518a 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -12,34 +12,34 @@ HEADERS = wellenreiterbase.h \ | |||
12 | hexwindow.h \ | 12 | hexwindow.h \ |
13 | statwindow.h \ | 13 | statwindow.h \ |
14 | configwindow.h \ | 14 | configwindow.h \ |
15 | manufacturers.h | 15 | manufacturers.h |
16 | 16 | ||
17 | SOURCES = main.cpp \ | 17 | SOURCES = main.cpp \ |
18 | mainwindow.cpp \ | 18 | mainwindow.cpp \ |
19 | wellenreiterbase.cpp \ | 19 | wellenreiterbase.cpp \ |
20 | wellenreiter.cpp \ | 20 | wellenreiter.cpp \ |
21 | scanlist.cpp \ | 21 | scanlist.cpp \ |
22 | logwindow.cpp \ | 22 | logwindow.cpp \ |
23 | hexwindow.cpp \ | 23 | hexwindow.cpp \ |
24 | statwindow.cpp \ | 24 | statwindow.cpp \ |
25 | configwindow.cpp \ | 25 | configwindow.cpp \ |
26 | manufacturers.cpp | 26 | manufacturers.cpp |
27 | 27 | ||
28 | INCLUDEPATH += $(OPIEDIR)/include | 28 | INCLUDEPATH += $(OPIEDIR)/include |
29 | DEPENDPATH += $(OPIEDIR)/include | 29 | DEPENDPATH += $(OPIEDIR)/include |
30 | INTERFACES = configbase.ui | 30 | INTERFACES = configbase.ui |
31 | TARGET = wellenreiter | 31 | TARGET = wellenreiter |
32 | 32 | ||
33 | !contains( platform, x11 ) { | 33 | !contains( platform, x11 ) { |
34 | message( qws ) | 34 | message( qws ) |
35 | include ( $(OPIEDIR)/include.pro ) | 35 | include ( $(OPIEDIR)/include.pro ) |
36 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 | 36 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++ |
37 | } | 37 | } |
38 | 38 | ||
39 | contains( platform, x11 ) { | 39 | contains( platform, x11 ) { |
40 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter | 40 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter |
41 | SOURCES += resource.cpp | 41 | SOURCES += resource.cpp |
42 | HEADERS += resource.h | 42 | HEADERS += resource.h |
43 | DESTDIR = $(OPIEDIR)/output/bin | 43 | DESTDIR = $(OPIEDIR)/output/bin |
44 | } | 44 | } |
45 | 45 | ||