[x264-devel] [Git][videolan/x264][master] 2 commits: Fix compilation of fprofiled shared build

[Anton Mitrofanov]

Anton Mitrofanov pushed to branch master at VideoLAN / x264


Commits:
0e227c47 by Anton Mitrofanov at 2019-11-01T17:49:52Z
Fix compilation of fprofiled shared build

- - - - -
b2e66dab by Anton Mitrofanov at 2019-11-01T17:49:52Z
Export symbols only when building shared library

- - - - -


2 changed files:

- Makefile
- configure


Changes:

=====================================
Makefile
=====================================
@@ -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) $(OBJSO) $(OBJCLI)
 # 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) CFLAGSPROF="$(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) CFLAGSPROF="$(PROF_USE_CC)" LDFLAGSPROF="$(PROF_USE_LD)"
 	rm -f $(OBJPROF:%.o=%.gcda) $(OBJPROF:%.o=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock *.pgd *.pgc
 endif
 


=====================================
configure
=====================================
@@ -380,7 +380,7 @@ opencl="yes"
 vsx="auto"
 
 CFLAGS="$CFLAGS -Wall -I. -I\$(SRCPATH)"
-CFLAGSSO="$CFLAGSSO -DX264_API_EXPORTS"
+CFLAGSSO="$CFLAGSSO"
 CFLAGSCLI="$CFLAGSCLI"
 LDFLAGS="$LDFLAGS"
 LDFLAGSCLI="$LDFLAGSCLI"
@@ -1372,6 +1372,10 @@ EOF
 
 ${SRCPATH}/version.sh >> x264_config.h
 
+if [ "$shared" = "yes" ]; then
+    CFLAGSSO="$CFLAGSSO -DX264_API_EXPORTS"
+fi
+
 if [ "$cli_libx264" = "system" ] ; then
     if [ "$shared" = "yes" ]; then
         if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then



View it on GitLab: https://code.videolan.org/videolan/x264/compare/3759fcb7b48037a5169715ab89f80a0ab4801cdf...b2e66daba6e82ccc433c019e2d61d2496e2a7cd5

-- 
View it on GitLab: https://code.videolan.org/videolan/x264/compare/3759fcb7b48037a5169715ab89f80a0ab4801cdf...b2e66daba6e82ccc433c019e2d61d2496e2a7cd5
You're receiving this email because of your account on code.videolan.org.