--- Makefile	2004/07/18 04:10:22	1.2
+++ Makefile	2008/11/27 11:57:51	1.7
@@ -8,15 +8,21 @@
 # Requires GNU Make because of shell expansion performed at a bad time with
 # other make programs (even using := variable assignments)
 #
-# $Id: Makefile,v 1.2 2004/07/18 04:10:22 suxen_drol Exp $
+# $Id: Makefile,v 1.7 2008/11/27 11:57:51 Isibaar Exp $
 ##############################################################################
 
 include sources.inc
 
 ##############################################################################
-# DXTREE must point to the DirectShow SDK root directory.
+# DXTREE must point to the directx sdk root directory.
+#
+# if a release prior to "directx v9.0 sdk update (summer 2003)" is installed,
+# uncomment the DXBASECLASSES=$(DXTREE)/Samples/MultiMedia/DirectShow/BaseClasses
 ##############################################################################
-DXTREE=/c/DXVCSDK
+DXTREE=/c/DX90SDK
+# DXTREE=/c/DXVCSDK
+DXBASECLASSES=$(DXTREE)/Samples/C++/DirectShow/BaseClasses
+# DXBASECLASSES=$(DXTREE)/Samples/MultiMedia/DirectShow/BaseClasses
 
 MAKEFILE_PWD:=$(shell pwd)
 LOCAL_XVID_SRCTREE:=$(MAKEFILE_PWD)/../src
@@ -29,14 +35,13 @@
 # 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
 CXXFLAGS += -DRELEASE \
         -I$(LOCAL_XVID_SRCTREE) \
         -I$(DXTREE)/Include \
-        -I$(DXTREE)/samples/MultiMedia/DirectShow/BaseClasses \
+        -I$(DXBASECLASSES) \
         -include $(DXTREE)/mingw_dshow_port.h
 CXXFLAGS += -mno-cygwin
 
@@ -49,7 +54,6 @@
 CFLAGS += -fstrength-reduce
 CFLAGS += -finline-functions
 CFLAGS += -fgcse
-CFLAGS += -freduce-all-givs
 CFLAGS += -ffast-math
 
 CXXFLAGS += -O2
@@ -107,9 +111,8 @@
 			-o $@ \
 			$(OBJECTS) xvid.ax.def \
 			-L$(DXTREE)/Lib -lstrmiids \
-			$(DXTREE)/samples/Multimedia/DirectShow/BaseClasses/strmbase.lib \
+			$(DXBASECLASSES)/strmbase.lib \
 			-luuid -lwinmm -lole32 -loleaut32 -lcomctl32 -lstdc++
-			
 
 clean:
 	@echo "  Cl: Object files and target lib"