Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
x264
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
x264
Commits
0e227c47
Commit
0e227c47
authored
Oct 31, 2019
by
Anton Mitrofanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation of fprofiled shared build
parent
3759fcb7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
Makefile
Makefile
+6
-3
No files found.
Makefile
View file @
0e227c47
...
...
@@ -8,6 +8,9 @@ vpath %.S $(SRCPATH)
vpath
%.asm
$(SRCPATH)
vpath
%.rc
$(SRCPATH)
CFLAGS
+=
$(CFLAGSPROF)
LDFLAGS
+=
$(LDFLAGSPROF)
GENERATED
=
all
:
default
...
...
@@ -341,7 +344,7 @@ ifneq ($(wildcard .depend),)
include
.depend
endif
OBJPROF
=
$(OBJS)
$(OBJCLI)
OBJPROF
=
$(OBJS)
$(OBJ
SO)
$(OBJ
CLI)
# These should cover most of the important codepaths
OPT0
=
--crf
30
-b1
-m1
-r1
--me
dia
--no-cabac
--direct
temporal
--ssim
--no-weightb
OPT1
=
--crf
16
-b2
-m3
-r3
--me
hex
--no-8x8dct
--direct
spatial
--no-dct-decimate
-t0
--slice-max-mbs
50
...
...
@@ -359,7 +362,7 @@ fprofiled:
@
echo
'i.e. YUV with resolution in the filename, y4m, or avisynth.'
else
fprofiled
:
clean
$(MAKE)
x264
$(EXE)
CFLAGS
=
"
$(CFLAGS)
$(PROF_GEN_CC)
"
LDFLAGS
=
"
$(LDFLAGS)
$(PROF_GEN_LD)
"
$(MAKE)
x264
$(EXE)
CFLAGS
PROF
=
"
$(PROF_GEN_CC)
"
LDFLAGSPROF
=
"
$(PROF_GEN_LD)
"
$(
foreach
V,
$(VIDS)
,
$(
foreach
I, 0 1 2 3 4 5 6 7, ./x264
$(EXE)
$
(
OPT
$I
)
--threads
1
$(V)
-o
$(DEVNULL)
;
))
ifeq
($(COMPILER),CL)
# Because Visual Studio timestamps the object files within the PGD, it fails to build if they change - only the executable should be deleted
...
...
@@ -367,7 +370,7 @@ ifeq ($(COMPILER),CL)
else
rm
-f
$(OBJPROF)
endif
$(MAKE)
CFLAGS
=
"
$(CFLAGS)
$(PROF_USE_CC)
"
LDFLAGS
=
"
$(LDFLAGS)
$(PROF_USE_LD)
"
$(MAKE)
CFLAGS
PROF
=
"
$(PROF_USE_CC)
"
LDFLAGSPROF
=
"
$(PROF_USE_LD)
"
rm -f $(OBJPROF
:
%.o=%.gcda) $(OBJPROF:%.o=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock *.pgd *.pgc
endif
...
...
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