pro fix

3 files changed, 10 insertions, 4 deletions

diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 3386ffe..233839f 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,162 +1,165 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on 
 TARGET		= kapi
 DESTDIR= ../bin
 
 include( ../variables.pri )
 
 
 INCLUDEPATH += . ./details  ./features  ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc  ../ interfaces 
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
 
 unix : {
 
 staticlib: {
+TARGET		= kapi_linux
 LIBS += ../bin/libmicrokabc_qtopia.a
 LIBS += ../bin/libmicrokabc_file.a
 LIBS += ../bin/libmicrokabc_dir.a
 LIBS += ../bin/libmicrokdepim.a
 LIBS += ../bin/libmicrokcal.a
 LIBS += ../bin/libmicrokabc.a
 LIBS += ../bin/libmicrokde.a
 LIBS += ../bin/libmicrokabc_qtopia.a
 LIBS += ../bin/libmicrokabc_file.a
 LIBS += ../bin/libmicrokabc_dir.a
 LIBS += ../bin/libmicrokdepim.a
 LIBS += ../bin/libmicrokcal.a
 LIBS += ../bin/libmicrokabc.a
 LIBS += ../bin/libmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 
 } else {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 LIBS += ../bin/libmicrokcal.so
 #LIBS += -lldap
 }
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 importol {
 debug: {
 LIBS += mfc71ud.lib
 }
 release: {
 LIBS += mfc71u.lib
 }
 DEFINES +=  _OL_IMPORT_
 HEADERS = ../outport/msoutl9.h \
  kaimportoldialog.h 
 SOURCES = ../outport/msoutl9.cpp \
  kaimportoldialog.cpp 
-}
 #olimport section end
+} else {
+TARGET		= kapi_me
+}
 }
 
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
 
 HEADERS += \
 features/mergewidget.h \
 features/distributionlistwidget.h \
 kcmconfigs/addresseewidget.h \
 kcmconfigs/extensionconfigdialog.h \
 kcmconfigs/kcmkabconfig.h \
 kcmconfigs/kabconfigwidget.h \
 addresseeeditordialog.h \
 addresseeeditorwidget.h \
 addresseditwidget.h \
 addresseeconfig.h \
 addresseeutil.h \
 emaileditwidget.h \
 filtereditdialog.h \
 kaddressbookmain.h \
 kabprefs.h \
 kabcore.h \
 viewmanager.h \
 extensionmanager.h \
 extensionwidget.h \
 kaddressbookview.h \
 geowidget.h \
 imagewidget.h \
 incsearchwidget.h \
 jumpbuttonbar.h \
 phoneeditwidget.h \
 secrecywidget.h \
 keywidget.h \
 nameeditdialog.h \
 filter.h \
 addviewdialog.h \
 configurewidget.h \
 viewconfigurewidget.h \
 viewconfigurefieldspage.h \
 viewconfigurefilterpage.h \
 typecombo.h \
 undo.h \
 undocmds.h \
 xxportmanager.h \
 xxportobject.h \
 xxportselectdialog.h \
 details/detailsviewcontainer.h \
 details/look_basic.h \
 details/look_html.h \
 views/kaddressbookiconview.h \
 views/kaddressbooktableview.h \
 views/kaddressbookcardview.h \
 views/configuretableviewdialog.h \
 views/configurecardviewdialog.h \
 views/cardview.h \
 views/colorlistbox.h \
 views/contactlistview.h \
 xxport/vcard_xxport.h \
 xxport/kde2_xxport.h \
 xxport/csv_xxport.h \
 xxport/csvimportdialog.h \
 xxport/opie_xxport.h \
 xxport/qtopia_xxport.h \
 xxport/sharpdtm_xxport.h \
 #details/look_details.h \
 #mainwindoiw.h \
 # alarmclient.h \
 # calendarview.h \
 # customlistviewitem.h \
 # datenavigator.h
 
 SOURCES += \
 addresseeeditordialog.cpp \
 addresseeeditorwidget.cpp \
 addresseditwidget.cpp \
 addresseeconfig.cpp \
 addresseeutil.cpp \
 extensionmanager.cpp \
 features/mergewidget.cpp \
 features/distributionlistwidget.cpp \
 kcmconfigs/addresseewidget.cpp \
 kcmconfigs/extensionconfigdialog.cpp \
 kcmconfigs/kcmkabconfig.cpp \
 kcmconfigs/kabconfigwidget.cpp \
 emaileditwidget.cpp \
 filtereditdialog.cpp \
 mainembedded.cpp \
 kaddressbookmain.cpp \
 kabcore.cpp \
 kabprefs.cpp \
 viewmanager.cpp \
 kaddressbookview.cpp \
 extensionwidget.cpp \
 geowidget.cpp \
 imagewidget.cpp \
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 0750083..50443ef 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,175 +1,178 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on
 TARGET		= kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 
 include( ../variables.pri )
 
 INCLUDEPATH += ../microkde  ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
 #../qtcompat
 DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #KORG_NOPRINTER KORG_NOKABC KORG_NODND 
 DEFINES += KORG_NOLVALTERNATION
 DEFINES +=  DESKTOP_VERSION
 unix : {
 staticlib: { 
+TARGET		= kopi_linux
 LIBS += ../bin/libmicrokabc_qtopia.a
 LIBS += ../bin/libmicrokabc_file.a
 LIBS += ../bin/libmicrokabc_dir.a
 LIBS += ../bin/libmicrokdepim.a
 LIBS += ../bin/libmicrokcal.a
 LIBS += ../bin/libmicrokabc.a
 LIBS += ../bin/libmicrokde.a
 LIBS += ../bin/libmicrokabc_qtopia.a
 LIBS += ../bin/libmicrokabc_file.a
 LIBS += ../bin/libmicrokabc_dir.a
 LIBS += ../bin/libmicrokdepim.a
 LIBS += ../bin/libmicrokcal.a
 LIBS += ../bin/libmicrokabc.a
 LIBS += ../bin/libmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 } else {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 #LIBS += -lbluetooth
 #LIBS += -lsdp
 
 #LIBS += -lldap
 }
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_  
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 importol: {
 debug: {
 LIBS += mfc71ud.lib
 QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 }
 release: {
 LIBS += mfc71u.lib
 }
 DEFINES +=  _OL_IMPORT_
 
 HEADERS += ../outport/msoutl9.h \
  koimportoldialog.h 
 
 SOURCES += ../outport/msoutl9.cpp \
  koimportoldialog.cpp
-}
 #olimport section end
+} else {
+TARGET		= kopi_me
+}
 
 }
 
  
 INTERFACES = kofilterview_base.ui 
 #filteredit_base.ui
 
 # kdateedit.h \
 
 HEADERS += datenavigatorcontainer.h \
  filteredit_base.h \
  alarmclient.h \
  calendarview.h \
  customlistviewitem.h \
  datenavigator.h \
  docprefs.h \
  filtereditdialog.h \
  incomingdialog.h \
  incomingdialog_base.h \
  interfaces/korganizer/baseview.h \
  interfaces/korganizer/calendarviewbase.h \
  journalentry.h \
  kdatenavigator.h \
  koagenda.h \
  koagendaitem.h \
  koagendaview.h \
  kocounterdialog.h \
  kodaymatrix.h \
  kodialogmanager.h \
  koeditordetails.h \
  koeditorgeneral.h \
  koeditorgeneralevent.h \
  koeditorgeneraltodo.h \
  koeditorrecurrence.h \
  koeventeditor.h \
  koeventpopupmenu.h \
  koeventview.h \
  koeventviewer.h \
  koeventviewerdialog.h \
  kofilterview.h \
  koglobals.h \
  koincidenceeditor.h \
  kojournalview.h \
  kolistview.h \
  kolocationbox.h \
  komonthview.h \
  koprefs.h \
  koprefsdialog.h \
  kotimespanview.h \
  kotodoeditor.h \
  kotodoview.h \
  kotodoviewitem.h \
  koviewmanager.h \
  kowhatsnextview.h \
  ktimeedit.h \
  lineview.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
  outgoingdialog_base.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
  ../kalarmd/alarmdialog.h \
 
 
 SOURCES += datenavigatorcontainer.cpp \ 
 filteredit_base.cpp \
  calendarview.cpp \
  datenavigator.cpp \
  docprefs.cpp \
  filtereditdialog.cpp \
  incomingdialog.cpp \
  incomingdialog_base.cpp \
  journalentry.cpp \
  kdatenavigator.cpp \
  koagenda.cpp \
  koagendaitem.cpp \
  koagendaview.cpp \
  kocounterdialog.cpp \
  kodaymatrix.cpp \
  kodialogmanager.cpp \
  koeditordetails.cpp \
  koeditorgeneral.cpp \
  koeditorgeneralevent.cpp \
  koeditorgeneraltodo.cpp \
  koeditorrecurrence.cpp \
  koeventeditor.cpp \
  koeventpopupmenu.cpp \
  koeventview.cpp \
  koeventviewer.cpp \
diff --git a/variables.pri b/variables.pri
index 4144b8e..5d3b6cb 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,14 +1,14 @@
 
 # variables settings for compilation for Linux desktop and Qt 3.x.x
 
 unix {
-CONFIG +=  release
 #for statically linking
 #CONFIG +=  staticlib
 }
 win32 {
-CONFIG +=  release
+#disable importol to make it running on windows ME/98
 CONFIG +=  importol
 
 }
 CONFIG +=  thread
+CONFIG +=  release