diff options
author | Diego Biurrun <diego@biurrun.de> | 2006-07-11 21:45:45 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2006-07-11 21:45:45 +0000 |
commit | 2f30a81d192b90fd3b12f2ce40227ed74a331b6d (patch) | |
tree | dbdaf9dd7f5862237d81bd3dec64c1572be744c0 /common.mak | |
parent | 3dc7174e9dbe0d12d84b6159e6733d3865ed53f5 (diff) | |
download | ffmpeg-2f30a81d192b90fd3b12f2ce40227ed74a331b6d.tar.gz |
CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead.
Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
-rw-r--r-- | common.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common.mak b/common.mak index 36f2377c61..ea743518f8 100644 --- a/common.mak +++ b/common.mak @@ -22,7 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR) $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) -ifeq ($(CONFIG_WIN32),yes) +ifeq ($(CONFIG_MINGW),yes) -lib /machine:i386 /def:$(@:.dll=.def) endif @@ -61,7 +61,7 @@ install-libs: $(INSTLIBTARGETS) install-lib-shared: $(SLIBNAME) install -d "$(libdir)" -ifeq ($(CONFIG_WIN32),yes) +ifeq ($(CONFIG_MINGW),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ @@ -85,7 +85,7 @@ install-headers: uninstall: uninstall-libs uninstall-headers uninstall-libs: -ifeq ($(CONFIG_WIN32),yes) +ifeq ($(CONFIG_MINGW),yes) -rm -f $(prefix)/$(SLIBNAME) else -rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \ |