From 3398fd37a19b5eda77fc9feab59804137795f14a Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Fri, 18 Jun 2010 03:08:16 +0000
Subject: *** empty log message ***

---
 src/im_wmv.mak | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'src/im_wmv.mak')

diff --git a/src/im_wmv.mak b/src/im_wmv.mak
index fef3c40..d6e4cfc 100644
--- a/src/im_wmv.mak
+++ b/src/im_wmv.mak
@@ -3,20 +3,38 @@ LIBNAME = im_wmv
 OPT = YES
 
 SRC = im_format_wmv.cpp
-                                       
-ifneq ($(findstring _64, $(TEC_UNAME)), )
-  WMFSDK = d:/lng/wmfsdk95
-  INCLUDES = $(WMFSDK)/include
+
+ifneq ($(findstring vc9, $(TEC_UNAME)), )
+  USE_WIN_SDK = Yes
+endif
+ifneq ($(findstring vc10, $(TEC_UNAME)), )
+  USE_WIN_SDK = Yes
+endif
+ifneq ($(findstring dll9, $(TEC_UNAME)), )
+  USE_WIN_SDK = Yes
+endif
+ifneq ($(findstring dll10, $(TEC_UNAME)), )
+  USE_WIN_SDK = Yes
+endif
+
+ifndef USE_WIN_SDK
+  #vc6-vc8 needs an external SDK
+  ifneq ($(findstring _64, $(TEC_UNAME)), )
+    WMFSDK = d:/lng/wmfsdk95
+    INCLUDES = $(WMFSDK)/include
+  else
+  #  WMFSDK = d:/lng/wmfsdk11
+  #  EXTRAINCS = $(WMFSDK)/include
+    WMFSDK = d:/lng/wmfsdk9
+    INCLUDES = $(WMFSDK)/include
+  endif
+  LDIR = $(WMFSDK)/lib
 else
-#  WMFSDK = d:/lng/wmfsdk11
-#  EXTRAINCS = $(WMFSDK)/include
-  WMFSDK = d:/lng/wmfsdk9
-  INCLUDES = $(WMFSDK)/include
+  #vc9-vc10, wmf sdk is inside Windows SDK
 endif
   
 DEFINES = _CRT_NON_CONFORMING_SWPRINTFS                                     
 
-LDIR = $(WMFSDK)/lib
 LIBS = wmvcore
 
 USE_IM = Yes
-- 
cgit v1.2.3