mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
correct DLL windows install
Originally committed as revision 2279 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
951bf3e681
commit
cb728d7902
@ -219,22 +219,27 @@ motion-test: motion_test.o $(LIB)
|
||||
fft-test: fft-test.o $(LIB)
|
||||
$(CC) -o $@ $^ -lm
|
||||
|
||||
install: all
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
install: all install-headers
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
install -s -m 755 $(SLIB) "$(prefix)"
|
||||
else
|
||||
install -d $(prefix)/lib
|
||||
install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
|
||||
ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
|
||||
ldconfig || true
|
||||
mkdir -p $(prefix)/include/ffmpeg
|
||||
install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
|
||||
install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
|
||||
endif
|
||||
else
|
||||
install:
|
||||
endif
|
||||
|
||||
installlib: all
|
||||
installlib: all install-headers
|
||||
install -m 644 $(LIB) $(prefix)/lib
|
||||
mkdir -p $(prefix)/include/ffmpeg
|
||||
|
||||
install-headers:
|
||||
mkdir -p "$(prefix)/include/ffmpeg"
|
||||
install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
|
||||
$(prefix)/include/ffmpeg
|
||||
"$(prefix)/include/ffmpeg"
|
||||
|
||||
#
|
||||
# include dependency files if they exist
|
||||
|
@ -77,7 +77,7 @@ $(LIB): $(OBJS) $(PPOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(SLIB): $(OBJS)
|
||||
ifeq ($(TARGET_MINGW32),yes)
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
|
||||
-lib /machine:i386 /def:$(@:.dll=.def)
|
||||
else
|
||||
@ -87,27 +87,29 @@ endif
|
||||
depend: $(SRCS)
|
||||
$(CC) -MM $(CFLAGS) $^ 1>.depend
|
||||
|
||||
install: all
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
install: all install-headers
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
install -s -m 755 $(SLIB) "$(prefix)"
|
||||
else
|
||||
install -d $(prefix)/lib
|
||||
install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
|
||||
ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
|
||||
ldconfig || true
|
||||
mkdir -p $(prefix)/include/ffmpeg
|
||||
install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h
|
||||
install -m 644 $(VPATH)/avio.h $(prefix)/include/ffmpeg/avio.h
|
||||
install -m 644 $(VPATH)/rtp.h $(prefix)/include/ffmpeg/rtp.h
|
||||
install -m 644 $(VPATH)/rtsp.h $(prefix)/include/ffmpeg/rtsp.h
|
||||
install -m 644 $(VPATH)/rtspcodes.h $(prefix)/include/ffmpeg/rtspcodes.h
|
||||
endif
|
||||
else
|
||||
install:
|
||||
endif
|
||||
|
||||
installlib: all
|
||||
installlib: all install-headers
|
||||
install -m 644 $(LIB) $(prefix)/lib
|
||||
mkdir -p $(prefix)/include/ffmpeg
|
||||
|
||||
install-headers:
|
||||
mkdir -p "$(prefix)/include/ffmpeg"
|
||||
install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
|
||||
$(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
|
||||
$(SRC_PATH)/libavformat/rtspcodes.h \
|
||||
$(prefix)/include/ffmpeg
|
||||
"$(prefix)/include/ffmpeg"
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
Loading…
Reference in New Issue
Block a user