summaryrefslogtreecommitdiff
authorzecke <zecke>2005-01-23 20:21:35 (UTC)
committer zecke <zecke>2005-01-23 20:21:35 (UTC)
commit8f2fbef1de1b3803a21d51752fee1014c951cc12 (patch) (unidiff)
tree9289dbe83d2f25af0e95adcad7e3e230920a9b12
parentda166ce6066568db9b7ac0bf5c2cc0dc9afb0776 (diff)
downloadopie-8f2fbef1de1b3803a21d51752fee1014c951cc12.zip
opie-8f2fbef1de1b3803a21d51752fee1014c951cc12.tar.gz
opie-8f2fbef1de1b3803a21d51752fee1014c951cc12.tar.bz2
-Use the global directory for .obj and .moc
-Include the foo.moc to work better The problem just came up yesterday
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp1
-rw-r--r--libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro2
-rw-r--r--libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp2
-rw-r--r--libopie2/examples/opiecore/odebugdemo/odebugdemo.pro3
4 files changed, 1 insertions, 7 deletions
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
index 6712870..2ee4a65 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
@@ -30,4 +30,3 @@ int main( int argc, char** argv )
30 30
31} 31}
32 32
33//#include "moc/oconfigdemo.moc"
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
index 9721e99..b29c106 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
@@ -7,8 +7,6 @@ INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += $(OPIEDIR)/include 7DEPENDPATH += $(OPIEDIR)/include
8LIBS += -lopiecore2 8LIBS += -lopiecore2
9TARGET = oconfigdemo 9TARGET = oconfigdemo
10MOC_DIR = moc
11OBJECTS_DIR = obj
12 10
13!contains( platform, x11 ) { 11!contains( platform, x11 ) {
14 include( $(OPIEDIR)/include.pro ) 12 include( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
index c0369ef..b046d28 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
@@ -139,4 +139,4 @@ int main( int argc, char** argv )
139 139
140} 140}
141 141
142#include "moc/odebugdemo.moc" 142#include "odebugdemo.moc"
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
index 781d678..e06053c 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
@@ -7,8 +7,6 @@ DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lopiecore2 7LIBS += -lopiecore2
8TARGET = odebugdemo 8TARGET = odebugdemo
9 9
10OBJECTS_DIR = obj
11
12!contains( platform, x11 ) { 10!contains( platform, x11 ) {
13 include( $(OPIEDIR)/include.pro ) 11 include( $(OPIEDIR)/include.pro )
14} 12}
@@ -17,4 +15,3 @@ contains( platform, x11 ) {
17 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 15 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
18} 16}
19 17
20MOC_DIR = moc