fix linking on arm

author: mickeyl <mickeyl> 2003-05-13 19:02:42 (UTC)
committer: mickeyl <mickeyl> 2003-05-13 19:02:42 (UTC)
commit: fa68b5c42a115b8c95195295e3af8d74bb520e04 (patch) (unidiff)
tree: 70c00b88e988ec9d94d74aa1a7f0cac2e76ca6ed
parent: e4807e4d90094bcc3251ffd65729466515a513f0 (diff)
download: opie-fa68b5c42a115b8c95195295e3af8d74bb520e04.zip
opie-fa68b5c42a115b8c95195295e3af8d74bb520e04.tar.gz
opie-fa68b5c42a115b8c95195295e3af8d74bb520e04.tar.bz2
3 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/camera/cmd/cmd.pro b/noncore/multimedia/camera/cmd/cmd.pro
index a5791f4..7981e82 100644
--- a/noncore/multimedia/camera/cmd/cmd.pro
+++ b/noncore/multimedia/camera/cmd/cmd.pro
@@ -1,18 +1,18 @@
 MOC_DIR         = ./moc
 OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
-CONFIG          = qt warn_on debug
+CONFIG          += qt warn_on debug
 HEADERS         = capture.h
 SOURCES         = capture.cpp
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
-LIBS            += -lopiecore2 -lopiecam
+LIBS            += -lqpe -lopiecore2 -lopiecam
 INTERFACES      =
 TARGET          = capture
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/camera/gui/gui.pro b/noncore/multimedia/camera/gui/gui.pro
index 3d76ad4..f587b57 100644
--- a/noncore/multimedia/camera/gui/gui.pro
+++ b/noncore/multimedia/camera/gui/gui.pro
@@ -1,21 +1,21 @@
 MOC_DIR         = ./moc
 OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
-CONFIG          = qt warn_on debug
+CONFIG          += qt warn_on debug
 HEADERS         = previewwidget.h \
                  mainwindow.h
 SOURCES         = previewwidget.cpp \
                  mainwindow.cpp \
                  main.cpp
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
 LIBS            += -lqpe -lopie -lopiecore2 -lopiecam
 INTERFACES      =
 TARGET          = opiecam
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/camera/lib/lib.pro b/noncore/multimedia/camera/lib/lib.pro
index 3e6b490..3d2c59b 100644
--- a/noncore/multimedia/camera/lib/lib.pro
+++ b/noncore/multimedia/camera/lib/lib.pro
@@ -1,24 +1,24 @@
 MOC_DIR         = ./moc
 OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/lib
 TEMPLATE        = lib
-CONFIG          = qt warn_on debug
+CONFIG          += qt warn_on debug
 HEADERS         = avi.h \
                  imageio.h \
                  zcameraio.h \
 SOURCES         = avi.c \
                  imageio.cpp \
                  zcameraio.cpp \
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie -lopiecore2
 INTERFACES      =
 VERSION         = 1.0.0
 TARGET          = opiecam
 include ( $(OPIEDIR)/include.pro )
author	mickeyl <mickeyl>	2003-05-13 19:02:42 (UTC)
committer	mickeyl <mickeyl>	2003-05-13 19:02:42 (UTC)
commit	fa68b5c42a115b8c95195295e3af8d74bb520e04 (patch) (unidiff)
tree	70c00b88e988ec9d94d74aa1a7f0cac2e76ca6ed
parent	e4807e4d90094bcc3251ffd65729466515a513f0 (diff)
download	opie-fa68b5c42a115b8c95195295e3af8d74bb520e04.zip opie-fa68b5c42a115b8c95195295e3af8d74bb520e04.tar.gz opie-fa68b5c42a115b8c95195295e3af8d74bb520e04.tar.bz2

diff --git a/noncore/multimedia/camera/cmd/cmd.pro b/noncore/multimedia/camera/cmd/cmd.pro index a5791f4..7981e82 100644 --- a/noncore/multimedia/camera/cmd/cmd.pro +++ b/noncore/multimedia/camera/cmd/cmd.pro
@@ -1,18 +1,18 @@
1	MOC_DIR = ./moc	1	MOC_DIR = ./moc
2	OBJECTS_DIR = ./obj	2	OBJECTS_DIR = ./obj
3	DESTDIR = $(OPIEDIR)/bin	3	DESTDIR = $(OPIEDIR)/bin
4	TEMPLATE = app	4	TEMPLATE = app
5	CONFIG = qt warn_on debug	5	CONFIG += qt warn_on debug
6		6
7	HEADERS = capture.h	7	HEADERS = capture.h
8		8
9	SOURCES = capture.cpp	9	SOURCES = capture.cpp
10		10
11	INCLUDEPATH += $(OPIEDIR)/include ../lib	11	INCLUDEPATH += $(OPIEDIR)/include ../lib
12	DEPENDPATH += $(OPIEDIR)/include ../lib	12	DEPENDPATH += $(OPIEDIR)/include ../lib
13	LIBS += -lopiecore2 -lopiecam	13	LIBS += -lqpe -lopiecore2 -lopiecam
14	INTERFACES =	14	INTERFACES =
15	TARGET = capture	15	TARGET = capture
16		16
17	include ( $(OPIEDIR)/include.pro )	17	include ( $(OPIEDIR)/include.pro )
18		18


diff --git a/noncore/multimedia/camera/gui/gui.pro b/noncore/multimedia/camera/gui/gui.pro index 3d76ad4..f587b57 100644 --- a/noncore/multimedia/camera/gui/gui.pro +++ b/noncore/multimedia/camera/gui/gui.pro
@@ -1,21 +1,21 @@
1	MOC_DIR = ./moc	1	MOC_DIR = ./moc
2	OBJECTS_DIR = ./obj	2	OBJECTS_DIR = ./obj
3	DESTDIR = $(OPIEDIR)/bin	3	DESTDIR = $(OPIEDIR)/bin
4	TEMPLATE = app	4	TEMPLATE = app
5	CONFIG = qt warn_on debug	5	CONFIG += qt warn_on debug
6		6
7	HEADERS = previewwidget.h \	7	HEADERS = previewwidget.h \
8	mainwindow.h	8	mainwindow.h
9		9
10	SOURCES = previewwidget.cpp \	10	SOURCES = previewwidget.cpp \
11	mainwindow.cpp \	11	mainwindow.cpp \
12	main.cpp	12	main.cpp
13		13
14	INCLUDEPATH += $(OPIEDIR)/include ../lib	14	INCLUDEPATH += $(OPIEDIR)/include ../lib
15	DEPENDPATH += $(OPIEDIR)/include ../lib	15	DEPENDPATH += $(OPIEDIR)/include ../lib
16	LIBS += -lqpe -lopie -lopiecore2 -lopiecam	16	LIBS += -lqpe -lopie -lopiecore2 -lopiecam
17	INTERFACES =	17	INTERFACES =
18	TARGET = opiecam	18	TARGET = opiecam
19		19
20	include ( $(OPIEDIR)/include.pro )	20	include ( $(OPIEDIR)/include.pro )
21		21


diff --git a/noncore/multimedia/camera/lib/lib.pro b/noncore/multimedia/camera/lib/lib.pro index 3e6b490..3d2c59b 100644 --- a/noncore/multimedia/camera/lib/lib.pro +++ b/noncore/multimedia/camera/lib/lib.pro
@@ -1,24 +1,24 @@
1	MOC_DIR = ./moc	1	MOC_DIR = ./moc
2	OBJECTS_DIR = ./obj	2	OBJECTS_DIR = ./obj
3	DESTDIR = $(OPIEDIR)/lib	3	DESTDIR = $(OPIEDIR)/lib
4	TEMPLATE = lib	4	TEMPLATE = lib
5	CONFIG = qt warn_on debug	5	CONFIG += qt warn_on debug
6		6
7	HEADERS = avi.h \	7	HEADERS = avi.h \
8	imageio.h \	8	imageio.h \
9	zcameraio.h \	9	zcameraio.h \
10		10
11	SOURCES = avi.c \	11	SOURCES = avi.c \
12	imageio.cpp \	12	imageio.cpp \
13	zcameraio.cpp \	13	zcameraio.cpp \
14		14
15	INCLUDEPATH += $(OPIEDIR)/include	15	INCLUDEPATH += $(OPIEDIR)/include
16	DEPENDPATH += $(OPIEDIR)/include	16	DEPENDPATH += $(OPIEDIR)/include
17	LIBS += -lqpe -lopie -lopiecore2	17	LIBS += -lqpe -lopie -lopiecore2
18	INTERFACES =	18	INTERFACES =
19	VERSION = 1.0.0	19	VERSION = 1.0.0
20	TARGET = opiecam	20	TARGET = opiecam
21		21
22		22
23	include ( $(OPIEDIR)/include.pro )	23	include ( $(OPIEDIR)/include.pro )
24		24