author | mickeyl <mickeyl> | 2005-05-19 11:59:32 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-19 11:59:32 (UTC) |
commit | ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a (patch) (side-by-side diff) | |
tree | 83b59755f58747cdb7e543a4c237e9e217b03fbd /libopie2/opiecore/opiecore.pro | |
parent | cb243f00d12c5fc40de02e7f9f20009b52303a66 (diff) | |
download | opie-ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a.zip opie-ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a.tar.gz opie-ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a.tar.bz2 |
- add linux pcmcia subsystem wrapper: OPcmciaSystem and OPcmciaCard
- move linux-only subsystems in subdirectory linux
- minor header cleanups
Diffstat (limited to 'libopie2/opiecore/opiecore.pro') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index 84f3343..cbb7e04 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro @@ -1,65 +1,59 @@ TEMPLATE = lib CONFIG += qt warn_on DESTDIR = $(OPIEDIR)/lib HEADERS = oapplication.h \ oconfig.h \ odebug.h \ oglobal.h \ oglobalsettings.h \ - oinputsystem.h \ okeyconfigmanager.h \ okeyfilter.h \ opluginloader.h \ oprocess.h \ oprocctrl.h \ oresource.h \ osharedpointer.h \ osmartpointer.h \ ostorageinfo.h \ xmltree.h SOURCES = oapplication.cpp \ oconfig.cpp \ odebug.cpp \ oglobal.cpp \ oglobalsettings.cpp \ - oinputsystem.cpp \ okeyconfigmanager.cpp \ okeyfilter.cpp \ opluginloader.cpp \ oprocess.cpp \ oprocctrl.cpp \ oresource.cpp \ osmartpointer.cpp \ ostorageinfo.cpp \ xmltree.cpp -# The following files are currently not compileable on mac ! -# Therfore I removed them from the build .. (eilers) - -CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) -!contains( CONFTEST, y ) { -HEADERS += ofilenotify.h -SOURCES += ofilenotify.cpp +# Disable Linux-only subsystems for MAC build +!contains( CONFIG_TARGET_MACOSX, y ) { +include ( linux/linux.pro ) } else { - message( "ofilenotify is not available in a mac build !" ) + message( "disabling linux-only subsystems for MAC build" ) } include( device/device.pro ) INTERFACES = TARGET = opiecore2 -VERSION = 1.9.3 +VERSION = 1.9.4 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include !contains( platform, x11 ) { LIBS = -lqpe include( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } |