Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
c0af3840
Commit
c0af3840
authored
19 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
Simplify LDFLAGS handling for MinGW.
Originally committed as revision 4907 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
45dd4350
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavcodec/Makefile
+6
-3
6 additions, 3 deletions
libavcodec/Makefile
libavformat/Makefile
+6
-3
6 additions, 3 deletions
libavformat/Makefile
libavutil/Makefile
+6
-3
6 additions, 3 deletions
libavutil/Makefile
with
18 additions
and
9 deletions
libavcodec/Makefile
+
6
−
3
View file @
c0af3840
...
...
@@ -9,6 +9,11 @@ VPATH=$(SRC_PATH)/libavcodec
# NOTE: -I.. is needed to include config.h
CFLAGS
=
$(
OPTFLAGS
)
-DHAVE_AV_CONFIG_H
-I
..
-I
$(
SRC_PATH
)
/libavutil
-D_FILE_OFFSET_BITS
=
64
-D_LARGEFILE_SOURCE
-D_GNU_SOURCE
$(
AMR_CFLAGS
)
#FIXME: This should be in configure/config.mak
ifeq
($(CONFIG_WIN32),yes)
LDFLAGS
=
-Wl
,--output-def,
$(
@:.dll
=
.def
)
endif
OBJS
=
bitstream.o utils.o mem.o allcodecs.o
\
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o
\
mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o
\
...
...
@@ -421,11 +426,9 @@ $(SLIBNAME): $(OBJS)
ifeq
($(CONFIG_PP),yes)
$(
MAKE
)
-C
libpostproc
endif
$(
CC
)
$(
SHFLAGS
)
$(
LDFLAGS
)
-o
$@
$(
OBJS
)
$(
EXTRALIBS
)
$(
AMREXTRALIBS
)
ifeq
($(CONFIG_WIN32),yes)
$(
CC
)
$(
SHFLAGS
)
-Wl
,--output-def,
$(
@:.dll
=
.def
)
-o
$@
$(
OBJS
)
$(
EXTRALIBS
)
$(
AMREXTRALIBS
)
-
lib /machine:i386 /def:
$(
@:.dll
=
.def
)
else
$(
CC
)
$(
SHFLAGS
)
$(
LDFLAGS
)
-o
$@
$(
OBJS
)
$(
EXTRALIBS
)
$(
AMREXTRALIBS
)
endif
dsputil.o
:
dsputil.c dsputil.h
...
...
This diff is collapsed.
Click to expand it.
libavformat/Makefile
+
6
−
3
View file @
c0af3840
...
...
@@ -8,6 +8,11 @@ VPATH=$(SRC_PATH)/libavformat
CFLAGS
=
$(
OPTFLAGS
)
-I
..
-I
$(
SRC_PATH
)
-I
$(
SRC_PATH
)
/libavutil
-I
$(
SRC_PATH
)
/libavcodec
-DHAVE_AV_CONFIG_H
-D_FILE_OFFSET_BITS
=
64
-D_LARGEFILE_SOURCE
-D_GNU_SOURCE
#FIXME: This should be in configure/config.mak
ifeq
($(CONFIG_WIN32),yes)
LDFLAGS
=
-Wl
,--output-def,
$(
@:.dll
=
.def
)
endif
OBJS
=
utils.o cutils.o os_support.o allformats.o
PPOBJS
=
...
...
@@ -106,11 +111,9 @@ $(LIB): $(OBJS) $(PPOBJS)
$(
RANLIB
)
$@
$(SLIBNAME)
:
$(OBJS)
$(
CC
)
$(
SHFLAGS
)
$(
LDFLAGS
)
-o
$@
$(
OBJS
)
$(
PPOBJS
)
$(
AVCLIBS
)
$(
EXTRALIBS
)
ifeq
($(CONFIG_WIN32),yes)
$(
CC
)
$(
SHFLAGS
)
-Wl
,--output-def,
$(
@:.dll
=
.def
)
-o
$@
$(
OBJS
)
$(
PPOBJS
)
$(
AVCLIBS
)
$(
EXTRALIBS
)
-
lib /machine:i386 /def:
$(
@:.dll
=
.def
)
else
$(
CC
)
$(
SHFLAGS
)
$(
LDFLAGS
)
-o
$@
$(
OBJS
)
$(
PPOBJS
)
$(
AVCLIBS
)
$(
EXTRALIBS
)
endif
depend
:
$(SRCS)
...
...
This diff is collapsed.
Click to expand it.
libavutil/Makefile
+
6
−
3
View file @
c0af3840
...
...
@@ -8,6 +8,11 @@ VPATH=$(SRC_PATH)/libavutil
# NOTE: -I.. is needed to include config.h
CFLAGS
=
$(
OPTFLAGS
)
-DHAVE_AV_CONFIG_H
-I
..
-D_FILE_OFFSET_BITS
=
64
-D_LARGEFILE_SOURCE
-D_GNU_SOURCE
#FIXME: This should be in configure/config.mak
ifeq
($(CONFIG_WIN32),yes)
LDFLAGS
=
-Wl
,--output-def,
$(
@:.dll
=
.def
)
endif
OBJS
=
mathematics.o
\
integer.o
\
rational.o
\
...
...
@@ -34,11 +39,9 @@ $(LIB): $(OBJS)
$(
RANLIB
)
$@
$(SLIBNAME)
:
$(OBJS)
$(
CC
)
$(
SHFLAGS
)
$(
LDFLAGS
)
-o
$@
$(
OBJS
)
$(
EXTRALIBS
)
$(
AMREXTRALIBS
)
ifeq
($(CONFIG_WIN32),yes)
$(
CC
)
$(
SHFLAGS
)
-Wl
,--output-def,
$(
@:.dll
=
.def
)
-o
$@
$(
OBJS
)
$(
EXTRALIBS
)
$(
AMREXTRALIBS
)
-
lib /machine:i386 /def:
$(
@:.dll
=
.def
)
else
$(
CC
)
$(
SHFLAGS
)
$(
LDFLAGS
)
-o
$@
$(
OBJS
)
$(
EXTRALIBS
)
$(
AMREXTRALIBS
)
endif
%.o
:
%.c
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment