[ekiga] [windows] Fix Makefile error in my previous commit, sigh!



commit 4f465c04c11eacdc4ecaa036e43ac9a7b4098de6
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed May 16 18:12:00 2012 +0200

    [windows] Fix Makefile error in my previous commit, sigh!

 win32/Makefile |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index ad8409b..c863515 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -252,24 +252,22 @@ DOC_LINGUAS :=
 confflags := --prefix=$(BUILDROOT) --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 
 confptlib := $(confflags) --enable-vfw \
-ifeq ($(MINGW32), 1)
-	# directx dir can be removed for mingw-w64
-	--with-directx-includedir=$(EKIGA_DIR)/win32/directx \
-endif
 	--disable-qos --disable-alsa --disable-esd --disable-oss --disable-sunaudio --disable-shmaudio \
 	--disable-v4l --disable-v4l2 --disable-bsdvideo --disable-avc --disable-dc
+ifeq ($(MINGW32), 1)
+confptlib := $(confptlib) --with-directx-includedir=$(EKIGA_DIR)/win32/directx
+endif
 
 # disable ilbc and silk non-free codecs
 confopal := $(confflags) --disable-t38 --disable-fax --disable-iLBC --disable-silk
 
 confekiga:= $(confflags) \
-ifeq ($(MINGW32), 1)
-	# directx dir can be removed for mingw-w64
-	--with-directx-dir=$(EKIGA_DIR)/win32/directx \
-endif
 	--prefix=$(EKIGA_PREFIX) --bindir=$(EKIGA_PREFIX) --datadir=$(EKIGA_PREFIX) \
 	--sysconfdir=$(EKIGA_PREFIX) --libdir=$(EKIGA_PREFIX) \
 	--with-ldap-dir=$(OPENLDAP_DIR) --with-libsasl2-dir=$(LIBSASL2_DIR) --with-boost=$(BUILDROOT) # --enable-static-libs
+ifeq ($(MINGW32), 1)
+confekiga := $(confekiga) --with-directx-dir=$(EKIGA_DIR)/win32/directx
+endif
 
 # h264 decoding is provided by libav, while encoding by x264 lib
 conflibav := --cross-prefix=$(HOST_TOOL_PREFIX)- --enable-shared --disable-static \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]