Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
951bf3e6
Commit
951bf3e6
authored
Sep 15, 2003
by
Fabrice Bellard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed windows build
Originally committed as revision 2278 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
8c522a40
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
48 deletions
+41
-48
Makefile
Makefile
+19
-26
configure
configure
+19
-19
ffinstall.nsi
ffinstall.nsi
+3
-3
No files found.
Makefile
View file @
951bf3e6
...
@@ -14,25 +14,15 @@ CFLAGS+=-p
...
@@ -14,25 +14,15 @@ CFLAGS+=-p
LDFLAGS
+=
-p
LDFLAGS
+=
-p
endif
endif
ifeq
($(CONFIG_WIN32),yes)
PROG
=
ffmpeg
$(EXESUF)
EXE
=
.exe
PROGTEST
=
output_example
$(EXESUF)
else
ifeq
($(CONFIG_OS2),yes)
EXE
=
.exe
else
EXE
=
endif
endif
PROG
=
ffmpeg
$(EXE)
PROGTEST
=
output_example
$(EXE)
ifeq
($(CONFIG_FFSERVER),yes)
ifeq
($(CONFIG_FFSERVER),yes)
PROG
+=
ffserver
$(EXE)
PROG
+=
ffserver
$(EXE
SUF
)
endif
endif
ifeq
($(CONFIG_FFPLAY),yes)
ifeq
($(CONFIG_FFPLAY),yes)
PROG
+=
ffplay
$(EXE)
PROG
+=
ffplay
$(EXE
SUF
)
endif
endif
ifeq
($(CONFIG_AUDIO_BEOS),yes)
ifeq
($(CONFIG_AUDIO_BEOS),yes)
...
@@ -78,28 +68,28 @@ FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
...
@@ -78,28 +68,28 @@ FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
all
:
lib $(PROG) $(PROGTEST) $(VHOOK)
all
:
lib $(PROG) $(PROGTEST) $(VHOOK)
lib
:
$(AMRLIBS)
lib
:
$(MAKE)
-C
libavcodec all
$(MAKE)
-C
libavcodec all
$(MAKE)
-C
libavformat all
$(MAKE)
-C
libavformat all
ffmpeg_g$(EXE)
:
ffmpeg.o cmdutils.o .libs
ffmpeg_g$(EXE
SUF
)
:
ffmpeg.o cmdutils.o .libs
$(CC)
$(LDFLAGS)
-o
$@
ffmpeg.o cmdutils.o
$(FFLIBS)
$(EXTRALIBS)
$(CC)
$(LDFLAGS)
-o
$@
ffmpeg.o cmdutils.o
$(FFLIBS)
$(EXTRALIBS)
ffmpeg$(EXE
)
:
ffmpeg_g$(EXE
)
ffmpeg$(EXE
SUF)
:
ffmpeg_g$(EXESUF
)
cp
-p
$<
$@
cp
-p
$<
$@
$(STRIP)
$@
$(STRIP)
$@
ffserver$(EXE)
:
ffserver.o .libs
ffserver$(EXE
SUF
)
:
ffserver.o .libs
$(CC)
$(LDFLAGS)
$(FFSLDFLAGS)
-o
$@
ffserver.o
$(FFLIBS)
$(EXTRALIBS)
$(CC)
$(LDFLAGS)
$(FFSLDFLAGS)
-o
$@
ffserver.o
$(FFLIBS)
$(EXTRALIBS)
ffplay_g$(EXE)
:
ffplay.o cmdutils.o .libs
ffplay_g$(EXE
SUF
)
:
ffplay.o cmdutils.o .libs
$(CC)
$(LDFLAGS)
-o
$@
ffplay.o cmdutils.o
$(FFLIBS)
$(EXTRALIBS)
$(SDL_LIBS)
$(CC)
$(LDFLAGS)
-o
$@
ffplay.o cmdutils.o
$(FFLIBS)
$(EXTRALIBS)
$(SDL_LIBS)
ffplay$(EXE
)
:
ffplay_g$(EXE
)
ffplay$(EXE
SUF)
:
ffplay_g$(EXESUF
)
cp
-p
$<
$@
cp
-p
$<
$@
$(STRIP)
$@
$(STRIP)
$@
output_example$(EXE)
:
output_example.o .libs
output_example$(EXE
SUF
)
:
output_example.o .libs
$(CC)
$(LDFLAGS)
-o
$@
output_example.o
$(FFLIBS)
$(EXTRALIBS)
$(CC)
$(LDFLAGS)
-o
$@
output_example.o
$(FFLIBS)
$(EXTRALIBS)
ffplay.o
:
ffplay.c
ffplay.o
:
ffplay.c
...
@@ -116,8 +106,8 @@ videohook: .libs
...
@@ -116,8 +106,8 @@ videohook: .libs
install
:
all install-man $(INSTALLVHOOK)
install
:
all install-man $(INSTALLVHOOK)
$(MAKE)
-C
libavcodec
install
$(MAKE)
-C
libavcodec
install
$(MAKE)
-C
libavformat
install
$(MAKE)
-C
libavformat
install
install
-d
$(prefix)
/bin
install
-d
"
$(bindir)
"
install
-c
-s
-m
755
$(PROG)
$(prefix)
/bin
install
-c
-s
-m
755
$(PROG)
"
$(bindir)
"
# create the window installer
# create the window installer
wininstaller
:
all install
wininstaller
:
all install
...
@@ -125,11 +115,13 @@ wininstaller: all install
...
@@ -125,11 +115,13 @@ wininstaller: all install
# install man from source dir if available
# install man from source dir if available
install-man
:
install-man
:
ifneq
($(CONFIG_WIN32),yes)
if
[
-f
$(SRC_PATH)/doc/ffmpeg.1
]
;
then
\
if
[
-f
$(SRC_PATH)/doc/ffmpeg.1
]
;
then
\
install
-d
$(mandir)/man1
;
\
install
-d
$(mandir)/man1
;
\
install
-m
644
$(SRC_PATH)/doc/ffmpeg.1
$(SRC_PATH)/doc/ffplay.1
\
install
-m
644
$(SRC_PATH)/doc/ffmpeg.1
$(SRC_PATH)/doc/ffplay.1
\
$(SRC_PATH)/doc/ffserver.1
$(mandir)/man1
;
\
$(SRC_PATH)/doc/ffserver.1
$(mandir)/man1
;
\
fi
fi
endif
install-vhook
:
$(prefix)/lib/vhook
install-vhook
:
$(prefix)/lib/vhook
$(MAKE)
-C
vhook
install
INSTDIR
=
$(prefix)
/lib/vhook
$(MAKE)
-C
vhook
install
INSTDIR
=
$(prefix)
/lib/vhook
...
@@ -161,7 +153,7 @@ clean: $(CLEANVHOOK)
...
@@ -161,7 +153,7 @@ clean: $(CLEANVHOOK)
$(MAKE)
-C
libavcodec clean
$(MAKE)
-C
libavcodec clean
$(MAKE)
-C
libavformat clean
$(MAKE)
-C
libavformat clean
$(MAKE)
-C
tests clean
$(MAKE)
-C
tests clean
rm
-f
*
.o
*
.d
*
~ .libs .depend gmon.out TAGS ffmpeg_g
$(EXE
)
ffplay_g
$(EXE
)
$(PROG)
rm
-f
*
.o
*
.d
*
~ .libs .depend gmon.out TAGS ffmpeg_g
$(EXE
SUF)
ffplay_g
$(EXESUF
)
$(PROG)
clean-vhook
:
clean-vhook
:
$(MAKE)
-C
vhook clean
$(MAKE)
-C
vhook clean
...
@@ -175,11 +167,12 @@ TAGS:
...
@@ -175,11 +167,12 @@ TAGS:
# regression tests
# regression tests
libavtest test mpeg4 mpeg test-server fulltest
:
ffmpeg$(EXE)
libavtest test mpeg4 mpeg test-server fulltest
:
ffmpeg$(EXE
SUF
)
$(MAKE)
-C
tests
$@
$(MAKE)
-C
tests
$@
# tar release (use 'make -k tar' on a checkouted tree)
# tar release (use 'make -k tar' on a checkouted tree)
FILE
=
ffmpeg-
$(
shell
cat
VERSION
)
FILE
=
ffmpeg-
$(
shell
grep
"
\#
define FFMPEG_VERSION "
libavcodec/avcodec.h |
\
cut
-d
"
\"
"
-f
2
)
tar
:
tar
:
rm
-rf
/tmp/
$(FILE)
rm
-rf
/tmp/
$(FILE)
...
...
configure
View file @
951bf3e6
...
@@ -20,6 +20,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
...
@@ -20,6 +20,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
# default parameters
# default parameters
prefix
=
"/usr/local"
prefix
=
"/usr/local"
mandir
=
""
mandir
=
""
bindir
=
""
cross_prefix
=
""
cross_prefix
=
""
cc
=
"gcc"
cc
=
"gcc"
ar
=
"ar"
ar
=
"ar"
...
@@ -98,6 +99,7 @@ LIBPREF="lib"
...
@@ -98,6 +99,7 @@ LIBPREF="lib"
LIBSUF
=
".a"
LIBSUF
=
".a"
SLIBPREF
=
"lib"
SLIBPREF
=
"lib"
SLIBSUF
=
".so"
SLIBSUF
=
".so"
EXESUF
=
""
risky
=
"yes"
risky
=
"yes"
amr_nb
=
"no"
amr_nb
=
"no"
amr_nb_fixed
=
"no"
amr_nb_fixed
=
"no"
...
@@ -186,16 +188,9 @@ CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
...
@@ -186,16 +188,9 @@ CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
esac
esac
;;
;;
MINGW32
*
)
MINGW32
*
)
v4l
=
"no"
# Note: the rest of the mingw32 config is done afterwards as mingw32
audio_oss
=
"no"
# can be forced on command line for linux cross compilation
dv1394
=
"no"
ffserver
=
"no"
network
=
"no"
mingw32
=
"yes"
mingw32
=
"yes"
LIBPREF
=
""
LIBSUF
=
".lib"
SLIBPREF
=
""
SLIBSUF
=
".dll"
;;
;;
CYGWIN
*
)
CYGWIN
*
)
v4l
=
"no"
v4l
=
"no"
...
@@ -224,6 +219,7 @@ LIBPREF=""
...
@@ -224,6 +219,7 @@ LIBPREF=""
LIBSUF
=
".lib"
LIBSUF
=
".lib"
SLIBPREF
=
""
SLIBPREF
=
""
SLIBSUF
=
".dll"
SLIBSUF
=
".dll"
EXESUF
=
".exe"
extralibs
=
""
extralibs
=
""
v4l
=
"no"
v4l
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
...
@@ -503,8 +499,15 @@ if test "$mingw32" = "yes" ; then
...
@@ -503,8 +499,15 @@ if test "$mingw32" = "yes" ; then
v4l
=
"no"
v4l
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
dv1394
=
"no"
dv1394
=
"no"
ffserver
=
"no"
network
=
"no"
network
=
"no"
prefix
=
"/c/Progra~1/FFmpeg"
LIBPREF
=
""
LIBSUF
=
".lib"
SLIBPREF
=
""
SLIBSUF
=
".dll"
EXESUF
=
".exe"
prefix
=
"/c/Program Files/FFmpeg"
bindir
=
"
$prefix
"
fi
fi
cc
=
"
${
cross_prefix
}${
cc
}
"
cc
=
"
${
cross_prefix
}${
cc
}
"
...
@@ -737,6 +740,10 @@ if test "$optimize" = "yes"; then
...
@@ -737,6 +740,10 @@ if test "$optimize" = "yes"; then
CFLAGS
=
"
$CFLAGS
-O3"
CFLAGS
=
"
$CFLAGS
-O3"
fi
fi
if
test
x
"
$bindir
"
=
x
""
;
then
bindir
=
"
${
prefix
}
/bin"
fi
if
test
x
"
$mandir
"
=
x
""
;
then
if
test
x
"
$mandir
"
=
x
""
;
then
mandir
=
"
${
prefix
}
/man"
mandir
=
"
${
prefix
}
/man"
fi
fi
...
@@ -850,6 +857,7 @@ echo "# Automatically generated by configure - do not modify" > config.mak
...
@@ -850,6 +857,7 @@ echo "# Automatically generated by configure - do not modify" > config.mak
echo
"/* Automatically generated by configure - do not modify */"
>
$TMPH
echo
"/* Automatically generated by configure - do not modify */"
>
$TMPH
echo
"prefix=
$prefix
"
>>
config.mak
echo
"prefix=
$prefix
"
>>
config.mak
echo
"bindir=
$bindir
"
>>
config.mak
echo
"mandir=
$mandir
"
>>
config.mak
echo
"mandir=
$mandir
"
>>
config.mak
echo
"MAKE=
$make
"
>>
config.mak
echo
"MAKE=
$make
"
>>
config.mak
echo
"CC=
$cc
"
>>
config.mak
echo
"CC=
$cc
"
>>
config.mak
...
@@ -864,6 +872,7 @@ echo "LIBPREF=$LIBPREF" >> config.mak
...
@@ -864,6 +872,7 @@ echo "LIBPREF=$LIBPREF" >> config.mak
echo
"LIBSUF=
$LIBSUF
"
>>
config.mak
echo
"LIBSUF=
$LIBSUF
"
>>
config.mak
echo
"SLIBPREF=
$SLIBPREF
"
>>
config.mak
echo
"SLIBPREF=
$SLIBPREF
"
>>
config.mak
echo
"SLIBSUF=
$SLIBSUF
"
>>
config.mak
echo
"SLIBSUF=
$SLIBSUF
"
>>
config.mak
echo
"EXESUF=
$EXESUF
"
>>
config.mak
echo
"TARGET_OS=
$TARGET_OS
"
>>
config.mak
echo
"TARGET_OS=
$TARGET_OS
"
>>
config.mak
if
test
"
$cpu
"
=
"x86"
;
then
if
test
"
$cpu
"
=
"x86"
;
then
echo
"TARGET_ARCH_X86=yes"
>>
config.mak
echo
"TARGET_ARCH_X86=yes"
>>
config.mak
...
@@ -900,9 +909,6 @@ if test "$mmx" = "yes" ; then
...
@@ -900,9 +909,6 @@ if test "$mmx" = "yes" ; then
echo
"#define HAVE_MMX 1"
>>
$TMPH
echo
"#define HAVE_MMX 1"
>>
$TMPH
echo
"#define __CPU__ 586"
>>
$TMPH
echo
"#define __CPU__ 586"
>>
$TMPH
fi
fi
if
test
"
$mingw32
"
=
"yes"
;
then
echo
"TARGET_MINGW32=yes"
>>
config.mak
fi
if
test
"
$builtin_vector
"
=
"yes"
;
then
if
test
"
$builtin_vector
"
=
"yes"
;
then
echo
"TARGET_BUILTIN_VECTOR=yes"
>>
config.mak
echo
"TARGET_BUILTIN_VECTOR=yes"
>>
config.mak
echo
"#define HAVE_BUILTIN_VECTOR 1"
>>
$TMPH
echo
"#define HAVE_BUILTIN_VECTOR 1"
>>
$TMPH
...
@@ -1060,12 +1066,6 @@ if test "$mingw32" = "yes" ; then
...
@@ -1060,12 +1066,6 @@ if test "$mingw32" = "yes" ; then
echo
"#ifndef __MINGW32__"
>>
$TMPH
echo
"#ifndef __MINGW32__"
>>
$TMPH
echo
"#define __MINGW32__ 1"
>>
$TMPH
echo
"#define __MINGW32__ 1"
>>
$TMPH
echo
"#endif"
>>
$TMPH
echo
"#endif"
>>
$TMPH
echo
"__MINGW32__=1"
>>
config.mak
fi
if
test
"
$cygwin
"
=
"yes"
;
then
# setup correct exesuffix
echo
"CONFIG_WIN32=yes"
>>
config.mak
fi
fi
if
test
"
$os2
"
=
"yes"
;
then
if
test
"
$os2
"
=
"yes"
;
then
...
...
ffinstall.nsi
View file @
951bf3e6
...
@@ -27,9 +27,9 @@ Section "Install"
...
@@ -27,9 +27,9 @@ Section "Install"
SetOutPath $INSTDIR
SetOutPath $INSTDIR
SetCompress Auto
SetCompress Auto
SetOverwrite IfNewer
SetOverwrite IfNewer
File "
C:\Program Files\FFmpeg\bin
\ffmpeg.exe"
File "
.
\ffmpeg.exe"
File "
C:\Program Files\FFmpeg\bin
\SDL.dll"
File "
.
\SDL.dll"
File "
C:\Program Files\FFmpeg\bin
\ffplay.exe"
File "
.
\ffplay.exe"
File ".\COPYING"
File ".\COPYING"
File ".\CREDITS"
File ".\CREDITS"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment