diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2011-01-08 04:34:00 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2011-01-08 04:34:00 +0000 |
| commit | af76f390291bbe958d2cb6ac09db8e52d9d30ddd (patch) | |
| tree | c457dfd16b80758ec343dc3ea33bac4a7de5befa /src/native/addrbook/msoutlook | |
| parent | 08f364ab3ae581888e6b88d9dd6d1fe6e51bf256 (diff) | |
| download | jitsi-af76f390291bbe958d2cb6ac09db8e52d9d30ddd.zip jitsi-af76f390291bbe958d2cb6ac09db8e52d9d30ddd.tar.gz jitsi-af76f390291bbe958d2cb6ac09db8e52d9d30ddd.tar.bz2 | |
Fixes the Makefile for the JNI binary of the support for the Address Book of Microsoft Outlook.
Diffstat (limited to 'src/native/addrbook/msoutlook')
| -rw-r--r-- | src/native/addrbook/msoutlook/Makefile | 14 | ||||
| -rw-r--r-- | src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cxx (renamed from src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cpp) | 0 | ||||
| -rw-r--r-- | src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cxx (renamed from src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cpp) | 0 | ||||
| -rw-r--r-- | src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx (renamed from src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.c) | 0 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/native/addrbook/msoutlook/Makefile b/src/native/addrbook/msoutlook/Makefile index 53e108c..31037ac 100644 --- a/src/native/addrbook/msoutlook/Makefile +++ b/src/native/addrbook/msoutlook/Makefile @@ -1,8 +1,8 @@ -CXX = c++ -O2 +CC = gcc -O2 OUTLOOK_MAPI_HEADERS ?= /c/Users/lyubomir/Downloads/Outlook2010MAPIHeaders TARGET_BASENAME = jmsoutlookaddrbook -ARCH = $(shell $(CXX) -dumpmachine | sed -e s/x86_64-.*/-64/ -e s/i.86-.*//) +ARCH = $(shell $(CC) -dumpmachine | sed -e s/x86_64-.*/-64/ -e s/i.86-.*//) ifeq "$(ARCH)" "-64" JAVA_HOME ?= C:/PROGRA~1/jdk else @@ -15,9 +15,9 @@ LIBS = -lmapi32 TARGET = ../../../../lib/native/windows$(ARCH)/$(TARGET_BASENAME).dll $(TARGET): \ - ../AddrBookContactQuery.c - MsOutlookMAPIHResultException.cpp \ - net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cpp \ - net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.c - $(CXX) $(CPPFLAGS) $^ $(LDFLAGS) -o $@ $(LIBS) + ../AddrBookContactQuery.c \ + MsOutlookMAPIHResultException.cxx \ + net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cxx \ + net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx + $(CC) $(CPPFLAGS) $^ $(LDFLAGS) -o $@ $(LIBS) -strip $(TARGET) diff --git a/src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cpp b/src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cxx index f3170af..f3170af 100644 --- a/src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cpp +++ b/src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cxx diff --git a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cpp b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cxx index f238e19..f238e19 100644 --- a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cpp +++ b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cxx diff --git a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.c b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx index f4d2f32..f4d2f32 100644 --- a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.c +++ b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx |