--- trunk/xvidcore/dshow/Makefile	2004/07/20 12:18:44	1514
+++ trunk/xvidcore/dshow/Makefile	2012/07/20 14:51:17	2062
@@ -8,7 +8,7 @@
 # Requires GNU Make because of shell expansion performed at a bad time with
 # other make programs (even using := variable assignments)
 #
-# $Id: Makefile,v 1.3 2004-07-20 12:18:44 suxen_drol Exp $
+# $Id: Makefile,v 1.7 2008-11-27 11:57:51 Isibaar Exp $
 ##############################################################################
 
 include sources.inc
@@ -19,7 +19,8 @@
 # if a release prior to "directx v9.0 sdk update (summer 2003)" is installed,
 # uncomment the DXBASECLASSES=$(DXTREE)/Samples/MultiMedia/DirectShow/BaseClasses
 ##############################################################################
-DXTREE=/c/DX9VCSDK
+DXTREE=/c/DX90SDK
+# DXTREE=/c/DXVCSDK
 DXBASECLASSES=$(DXTREE)/Samples/C++/DirectShow/BaseClasses
 # DXBASECLASSES=$(DXTREE)/Samples/MultiMedia/DirectShow/BaseClasses
 
@@ -34,7 +35,6 @@
 # The `mingw-runtime` package is required when building with -mno-cygwin
 CFLAGS += -mthreads
 CFLAGS += -I$(SRC_DIR)/w32api -I$(LOCAL_XVID_SRCTREE)
-CFLAGS += -D_WIN32_IE=0x0500
 CFLAGS += -mno-cygwin
 
 CXXFLAGS +=-mthreads
@@ -54,7 +54,6 @@
 CFLAGS += -fstrength-reduce
 CFLAGS += -finline-functions
 CFLAGS += -fgcse
-CFLAGS += -freduce-all-givs
 CFLAGS += -ffast-math
 
 CXXFLAGS += -O2
@@ -113,8 +112,7 @@
 			$(OBJECTS) xvid.ax.def \
 			-L$(DXTREE)/Lib -lstrmiids \
 			$(DXBASECLASSES)/strmbase.lib \
-			-luuid -lwinmm -lole32 -loleaut32 -lcomctl32 -lstdc++
-			
+			-luuid -lwinmm -lole32 -loleaut32 -lcomctl32 -lstdc++ #-lgdi32
 
 clean:
 	@echo "  Cl: Object files and target lib"