summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorjkeil <jkeil@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-14 18:28:56 +0000
committerjkeil <jkeil@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-14 18:28:56 +0000
commitfe55d26666ef0b0e5756b87613c9ac9afb994ccf (patch)
tree5e64a549c0b0ab8d36faede82d1dceb690b7d6dc /Makefile
parent64fe159a41a6d83c293ce3262bcd0251d7058ea5 (diff)
downloadmpv-fe55d26666ef0b0e5756b87613c9ac9afb994ccf.tar.bz2
mpv-fe55d26666ef0b0e5756b87613c9ac9afb994ccf.tar.xz
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
Win32 DLL code into mplayer. Default for USE_WIN32DLL is enabled on x86 machines, disabled otherwise. Use of Win32 DLLs can be disabled on x86 using the --disable-win32 configure option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1518 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 3ce5919566..1bbbe5fedd 100644
--- a/Makefile
+++ b/Makefile
@@ -24,15 +24,12 @@ VO_LIBS = -Llibvo -lvo $(X_LIBS)
PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb
-ifeq ($(TARGET_ARCH_X86),yes)
+ifneq ($(W32_LIB),)
PARTS += loader loader/DirectShow
SRCS += dll_init.c
-LOADER_DEP = loader/libloader.a $(DS_DEP)
-LIB_LOADER = -Lloader -lloader $(DS_LIB)
-else
-LOADER_DEP =
-LIB_LOADER =
endif
+LOADER_DEP = $(W32_DEP) $(DS_DEP)
+LIB_LOADER = $(W32_LIB) $(DS_LIB)
.SUFFIXES: .c .o