summaryrefslogtreecommitdiff
authorsimon <simon>2003-04-20 10:21:23 (UTC)
committer simon <simon>2003-04-20 10:21:23 (UTC)
commitcf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486 (patch) (unidiff)
treee731ac81737e26369b5060d58761590acbe279ed
parentb2583563a61e1ac1d9207fb3c008443a5fc7dc3c (diff)
downloadopie-cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486.zip
opie-cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486.tar.gz
opie-cf40011c4e26c2e27d55b6e7e7a0dfdd25a8a486.tar.bz2
- these apps need libstdc++ when built with a 3.2 toolchain
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/opierec.pro2
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro2
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 @@
1TEMPLATE = app 1TEMPLATE = app
2#CONFIG = qt warn_on debug 2#CONFIG = qt warn_on debug
3CONFIG = qt warn_on release 3CONFIG = qt warn_on release
4HEADERS = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h 4HEADERS = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h
5SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp 5SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += $(OPIEDIR)/include 7DEPENDPATH += $(OPIEDIR)/include
8LIBS += -lqpe -lpthread 8LIBS += -lqpe -lstdc++ -lpthread
9INTERFACES = 9INTERFACES =
10TARGET = opierec 10TARGET = opierec
11DESTDIR = $(OPIEDIR)/bin 11DESTDIR = $(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
13include ( $(OPIEDIR)/include.pro ) 13include ( $(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
@@ -1,45 +1,45 @@
1MOC_DIR = ./tmp 1MOC_DIR = ./tmp
2OBJECTS_DIR = ./tmp 2OBJECTS_DIR = ./tmp
3DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4TEMPLATE = app 4TEMPLATE = app
5CONFIG = qt warn_on debug 5CONFIG = qt warn_on debug
6 6
7HEADERS = wellenreiterbase.h \ 7HEADERS = wellenreiterbase.h \
8 mainwindow.h \ 8 mainwindow.h \
9 wellenreiter.h \ 9 wellenreiter.h \
10 scanlist.h \ 10 scanlist.h \
11 logwindow.h \ 11 logwindow.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
17SOURCES = main.cpp \ 17SOURCES = 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
28INCLUDEPATH += $(OPIEDIR)/include 28INCLUDEPATH += $(OPIEDIR)/include
29DEPENDPATH += $(OPIEDIR)/include 29DEPENDPATH += $(OPIEDIR)/include
30INTERFACES = configbase.ui 30INTERFACES = configbase.ui
31TARGET = wellenreiter 31TARGET = 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
39contains( platform, x11 ) { 39contains( 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