author | tille <tille> | 2003-08-25 12:56:53 (UTC) |
---|---|---|
committer | tille <tille> | 2003-08-25 12:56:53 (UTC) |
commit | c817abf3b81ca47927433ede1efd9afddfc15a72 (patch) (unidiff) | |
tree | 3e5727ad9bd9b54475f04d2be33bb8db6e26636f /libopie2/opiemm | |
parent | ff72e85696d070efa03975ea8130807579a6e1d9 (diff) | |
download | opie-c817abf3b81ca47927433ede1efd9afddfc15a72.zip opie-c817abf3b81ca47927433ede1efd9afddfc15a72.tar.gz opie-c817abf3b81ca47927433ede1efd9afddfc15a72.tar.bz2 |
libopie2 compiles for qt3/x11 now
run:
qmake "platform=x11" libopie2.pro
-rw-r--r-- | libopie2/opiemm/opiemm.pro | 8 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index 8e5eeb4..d3ce8f7 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro | |||
@@ -7,10 +7,16 @@ INTERFACES = | |||
7 | TARGET = opiemm2 | 7 | TARGET = opiemm2 |
8 | VERSION = 1.8.1 | 8 | VERSION = 1.8.1 |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += | 11 | LIBS += |
12 | MOC_DIR = moc | 12 | MOC_DIR = moc |
13 | OBJECTS_DIR = obj | 13 | OBJECTS_DIR = obj |
14 | 14 | ||
15 | include ( $(OPIEDIR)/include.pro ) | ||
16 | 15 | ||
16 | !contains( platform, x11 ) { | ||
17 | include ( $(OPIEDIR)/include.pro ) | ||
18 | } | ||
19 | |||
20 | contains( platform, x11 ) { | ||
21 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
22 | } | ||
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index fd23bea..d857659 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -34,16 +34,17 @@ | |||
34 | #include <errno.h> | 34 | #include <errno.h> |
35 | #include <fcntl.h> | 35 | #include <fcntl.h> |
36 | #include <string.h> | 36 | #include <string.h> |
37 | #include <sys/ioctl.h> | 37 | #include <sys/ioctl.h> |
38 | #include <sys/types.h> | 38 | #include <sys/types.h> |
39 | #include <sys/soundcard.h> | 39 | #include <sys/soundcard.h> |
40 | #include <sys/stat.h> | 40 | #include <sys/stat.h> |
41 | 41 | ||
42 | #include <qstringlist.h> | ||
42 | 43 | ||
43 | /*====================================================================================== | 44 | /*====================================================================================== |
44 | * OSoundSystem | 45 | * OSoundSystem |
45 | *======================================================================================*/ | 46 | *======================================================================================*/ |
46 | 47 | ||
47 | OSoundSystem* OSoundSystem::_instance = 0; | 48 | OSoundSystem* OSoundSystem::_instance = 0; |
48 | 49 | ||
49 | OSoundSystem::OSoundSystem() | 50 | OSoundSystem::OSoundSystem() |