From af76f390291bbe958d2cb6ac09db8e52d9d30ddd Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Sat, 8 Jan 2011 04:34:00 +0000 Subject: [PATCH] Fixes the Makefile for the JNI binary of the support for the Address Book of Microsoft Outlook. --- src/native/addrbook/msoutlook/Makefile | 14 +++++++------- ...ption.cpp => MsOutlookMAPIHResultException.cxx} | 0 ...ok_msoutlook_MsOutlookAddrBookContactQuery.cxx} | 0 ...look_MsOutlookAddrBookContactSourceService.cxx} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename src/native/addrbook/msoutlook/{MsOutlookMAPIHResultException.cpp => MsOutlookMAPIHResultException.cxx} (100%) rename src/native/addrbook/msoutlook/{net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cpp => net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cxx} (100%) rename src/native/addrbook/msoutlook/{net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.c => net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx} (100%) diff --git a/src/native/addrbook/msoutlook/Makefile b/src/native/addrbook/msoutlook/Makefile index 53e108ca1..31037acca 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 similarity index 100% rename from src/native/addrbook/msoutlook/MsOutlookMAPIHResultException.cpp rename to 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 similarity index 100% rename from src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactQuery.cpp rename to 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 similarity index 100% rename from src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.c rename to src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx