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 ***

---
 mak.vc9/im_wmv.vcproj |  2 +-
 src/im_wmv.mak        | 36 ++++++++++++++++++++++++--------
 src/make_uname.bat    | 57 +++------------------------------------------------
 3 files changed, 31 insertions(+), 64 deletions(-)

diff --git a/mak.vc9/im_wmv.vcproj b/mak.vc9/im_wmv.vcproj
index f767689..92c6d0b 100644
--- a/mak.vc9/im_wmv.vcproj
+++ b/mak.vc9/im_wmv.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include;../src;d:\LNG\WMFSDK9\include"
+				AdditionalIncludeDirectories="../include;../src;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
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
diff --git a/src/make_uname.bat b/src/make_uname.bat
index 0bfcec1..3dcd2e3 100644
--- a/src/make_uname.bat
+++ b/src/make_uname.bat
@@ -1,9 +1,6 @@
 @echo off
 REM This builds all the libraries of the folder for 1 uname  
 
-if "%1"=="VCC" goto do-vcc
-if "%1"=="vc-all" goto start-all-vc
-
 call tecmake %1 %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=im_process" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=im_jp2" %2 %3 %4 %5 %6 %7 %8
@@ -18,57 +15,9 @@ call tecmake %1 "MF=imlua_jp2" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=imlua_avi" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=imlua_fftw5" %2 %3 %4 %5 %6 %7 %8
 
-if "%1"=="vc6"  goto vc
-if "%1"=="vc7"  goto vc
-if "%1"=="vc8"  goto vc
-if "%1"=="vc8_64"  goto vc
-if "%1"=="vc9"  goto vc
-if "%1"=="vc9_64"  goto vc
-if "%1"=="dll"  goto vc
-if "%1"=="dll7"  goto vc
-if "%1"=="dll8"  goto vc
-if "%1"=="dll8_64"  goto vc
-if "%1"=="dll9"  goto vc
-if "%1"=="dll9_64"  goto vc
-if "%1"=="all"  goto start-all-vc
-goto end
-
-:vc
+REM WMV and Capture are NOT available in some compiler
+REM so this may result in errors, just ignore them
 call tecmake %1 "MF=im_wmv" %2 %3 %4 %5 %6 %7 %8
-call tecmake %1 "MF=imlua_wmv" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=im_capture" %2 %3 %4 %5 %6 %7 %8
+call tecmake %1 "MF=imlua_wmv" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=imlua_capture5" %2 %3 %4 %5 %6 %7 %8
-if "%1"=="dll"  goto dll
-goto end
-
-:dll
-call tecmake mingw4 "MF=im_capture" mingw4-dll
-call tecmake mingw3 "MF=im_capture" mingw3-dll
-call tecmake bc56 "MF=im_capture" bc56-dll
-REM call tecmake owc1 "MF=im_capture" owc1-dll
-goto end
-
-:start-all-vc
-call make_uname VCC vc6 %2 %3 %4 %5 %6
-call make_uname VCC vc7 %2 %3 %4 %5 %6
-call make_uname VCC vc8 %2 %3 %4 %5 %6
-call make_uname VCC vc8_64 %2 %3 %4 %5 %6
-call make_uname VCC vc9 %2 %3 %4 %5 %6
-call make_uname VCC vc9_64 %2 %3 %4 %5 %6
-call make_uname VCC dll %2 %3 %4 %5 %6
-call make_uname VCC dll7 %2 %3 %4 %5 %6
-call make_uname VCC dll8 %2 %3 %4 %5 %6
-call make_uname VCC dll8_64 %2 %3 %4 %5 %6
-call make_uname VCC dll9 %2 %3 %4 %5 %6
-call make_uname VCC dll9_64 %2 %3 %4 %5 %6
-goto end
-
-:do-vcc
-call tecmake %2 "MF=im_wmv" %3 %4 %5 %6 %7 %8
-call tecmake %2 "MF=imlua_wmv" %3 %4 %5 %6 %7 %8
-call tecmake %2 "MF=im_capture" %3 %4 %5 %6 %7 %8
-call tecmake %2 "MF=imlua_capture5" %3 %4 %5 %6 %7 %8
-if "%2"=="dll"  goto dll
-goto end
-
-:end
-- 
cgit v1.2.3