author | mickeyl <mickeyl> | 2005-08-23 10:06:07 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-23 10:06:07 (UTC) |
commit | d6e8e6bf49bb176ec54efed5eb0d012098f056d7 (patch) (side-by-side diff) | |
tree | 7fc70f3d3b41ee05ddb2ea559c7339a18ef0464b /noncore/tools/calc2 | |
parent | ce5b18efcb27c853ed4af2b603a82d3f89097764 (diff) | |
download | opie-d6e8e6bf49bb176ec54efed5eb0d012098f056d7.zip opie-d6e8e6bf49bb176ec54efed5eb0d012098f056d7.tar.gz opie-d6e8e6bf49bb176ec54efed5eb0d012098f056d7.tar.bz2 |
make calc2 a subdir project
-rw-r--r-- | noncore/tools/calc2/binary/binary.pro | 10 | ||||
-rw-r--r-- | noncore/tools/calc2/calc2.pro | 2 | ||||
-rw-r--r-- | noncore/tools/calc2/config.in | 4 | ||||
-rw-r--r-- | noncore/tools/calc2/main/.cvsignore | 1 | ||||
-rw-r--r-- | noncore/tools/calc2/main/calc.cpp (renamed from noncore/tools/calc2/calc.cpp) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/calc.h (renamed from noncore/tools/calc2/calc.h) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/engine.cpp (renamed from noncore/tools/calc2/engine.cpp) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/engine.h (renamed from noncore/tools/calc2/engine.h) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/instruction.h (renamed from noncore/tools/calc2/instruction.h) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/main.cpp (renamed from noncore/tools/calc2/main.cpp) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/main.pro | 12 | ||||
-rw-r--r-- | noncore/tools/calc2/main/plugininterface.h (renamed from noncore/tools/calc2/plugininterface.h) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/main/stdinstructions.h (renamed from noncore/tools/calc2/stdinstructions.h) | 0 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simple.pro | 4 |
14 files changed, 23 insertions, 10 deletions
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 9cbb0ff..3f268f1 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro @@ -1,15 +1,11 @@ TEMPLATE = lib CONFIG += qt INTERFACES += binary.ui -HEADERS = binaryimpl.h \ - binaryfactory.h -SOURCES = binaryimpl.cpp \ - binaryfactory.cpp -INCLUDEPATH += $(OPIEDIR)/include \ - $(OPIEDIR)/calc2 +HEADERS = binaryimpl.h binaryfactory.h +SOURCES = binaryimpl.cpp binaryfactory.cpp +INCLUDEPATH += $(OPIEDIR)/include ../main DEPENDPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/plugins/calculator TARGET = binary - include( $(OPIEDIR)/include.pro ) diff --git a/noncore/tools/calc2/calc2.pro b/noncore/tools/calc2/calc2.pro new file mode 100644 index 0000000..0119052 --- a/dev/null +++ b/noncore/tools/calc2/calc2.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = main simple binary diff --git a/noncore/tools/calc2/config.in b/noncore/tools/calc2/config.in new file mode 100644 index 0000000..df2c463 --- a/dev/null +++ b/noncore/tools/calc2/config.in @@ -0,0 +1,4 @@ + config CALCULATOR2 + boolean "opie-calculator2 (A plugin based calculator)" + default "y" + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/tools/calc2/main/.cvsignore b/noncore/tools/calc2/main/.cvsignore new file mode 100644 index 0000000..6d678c6 --- a/dev/null +++ b/noncore/tools/calc2/main/.cvsignore @@ -0,0 +1 @@ +config.in diff --git a/noncore/tools/calc2/calc.cpp b/noncore/tools/calc2/main/calc.cpp index 8c50c2c..8c50c2c 100644 --- a/noncore/tools/calc2/calc.cpp +++ b/noncore/tools/calc2/main/calc.cpp diff --git a/noncore/tools/calc2/calc.h b/noncore/tools/calc2/main/calc.h index b52356d..b52356d 100644 --- a/noncore/tools/calc2/calc.h +++ b/noncore/tools/calc2/main/calc.h diff --git a/noncore/tools/calc2/engine.cpp b/noncore/tools/calc2/main/engine.cpp index 74cd701..74cd701 100644 --- a/noncore/tools/calc2/engine.cpp +++ b/noncore/tools/calc2/main/engine.cpp diff --git a/noncore/tools/calc2/engine.h b/noncore/tools/calc2/main/engine.h index 15c9aa1..15c9aa1 100644 --- a/noncore/tools/calc2/engine.h +++ b/noncore/tools/calc2/main/engine.h diff --git a/noncore/tools/calc2/instruction.h b/noncore/tools/calc2/main/instruction.h index 6077bf0..6077bf0 100644 --- a/noncore/tools/calc2/instruction.h +++ b/noncore/tools/calc2/main/instruction.h diff --git a/noncore/tools/calc2/main.cpp b/noncore/tools/calc2/main/main.cpp index ebfcc28..ebfcc28 100644 --- a/noncore/tools/calc2/main.cpp +++ b/noncore/tools/calc2/main/main.cpp diff --git a/noncore/tools/calc2/main/main.pro b/noncore/tools/calc2/main/main.pro new file mode 100644 index 0000000..e2eda1f --- a/dev/null +++ b/noncore/tools/calc2/main/main.pro @@ -0,0 +1,12 @@ +TEMPLATE = app +CONFIG += qt +# Input +HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h +SOURCES += calc.cpp main.cpp engine.cpp +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -Wl,-export-dynamic +TARGET = calc2 +DESTDIR = $(OPIEDIR)/bin + +include( $(OPIEDIR)/include.pro ) diff --git a/noncore/tools/calc2/plugininterface.h b/noncore/tools/calc2/main/plugininterface.h index df6db9d..df6db9d 100644 --- a/noncore/tools/calc2/plugininterface.h +++ b/noncore/tools/calc2/main/plugininterface.h diff --git a/noncore/tools/calc2/stdinstructions.h b/noncore/tools/calc2/main/stdinstructions.h index a575968..a575968 100644 --- a/noncore/tools/calc2/stdinstructions.h +++ b/noncore/tools/calc2/main/stdinstructions.h diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index dde5e7d..b27cc7a 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro @@ -2,11 +2,9 @@ TEMPLATE = lib CONFIG += qt INTERFACES += simple.ui HEADERS = simpleimpl.h simplefactory.h stdinstructions.h SOURCES = simpleimpl.cpp simplefactory.cpp -INCLUDEPATH += $(OPIEDIR)/include \ - $(OPIEDIR)/calc2 +INCLUDEPATH += $(OPIEDIR)/include ../main/ DEPENDPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/plugins/calculator - include( $(OPIEDIR)/include.pro ) |