[Debian-iot-packaging] [openzwave-controlpanel] 34/81: Support multiple architectures for Mac OS X

[Dara Adib]

This is an automated email from the git hooks/post-receive script.

daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.

commit d2d3aa0b72f72dca36190c4db52d09f8be3953a2
Author: glsatz at gmail.com <glsatz at gmail.com>
Date:   Mon Jan 7 19:03:37 2013 +0000

    Support multiple architectures for Mac OS X
---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 698baed..9a80866 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ LD     := g++
 AR     := ar rc
 RANLIB := ranlib
 
-DEBUG_CFLAGS    := -Wall -Wno-inline -Wno-format -g -DDEBUG -Werror
-RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Wno-format -O3 -DNDEBUG
+DEBUG_CFLAGS    := -Wall -Wno-unknown-pragmas -Wno-inline -Werror -Wno-format -g -DDEBUG
+RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Werror -Wno-format -O3 -DNDEBUG
 
 DEBUG_LDFLAGS	:= -g
 
@@ -33,14 +33,15 @@ INCLUDES := -I $(OPENZWAVE)/cpp/src -I $(OPENZWAVE)/cpp/src/command_classes/ \
 GNUTLS := #-lgnutls
 
 # for Linux uncomment out next two lines
-LIBZWAVE := $(wildcard $(OPENZWAVE)/cpp/lib/linux/*.a)
-LIBUSB := -ludev
+#LIBZWAVE := $(wildcard $(OPENZWAVE)/cpp/lib/linux/*.a)
+#LIBUSB := -ludev
 
-# for Mac OS X comment out above 2 lines and uncomment next 2 lines
+# for Mac OS X comment out above 2 lines and uncomment next 5 lines
+#ARCH := -arch i386 -arch x86_64
+#CFLAGS += $(ARCH)
 #LIBZWAVE := $(wildcard $(OPENZWAVE)/cpp/lib/mac/*.a)
 #LIBUSB := -framework IOKit -framework CoreFoundation
-
-LIBS := $(LIBZWAVE) $(GNUTLS) $(LIBMICROHTTPD) -pthread $(LIBUSB)
+#LIBS := $(LIBZWAVE) $(GNUTLS) $(LIBMICROHTTPD) -pthread $(LIBUSB) $(ARCH)
 
 %.o : %.cpp
 	$(CXX) $(CFLAGS) $(INCLUDES) -o $@ $<

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git