hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-30 12:44:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Don't compile executable with PIC.

Browse source 
- It's required for .so and .dylib, but not for .dll or the executable.
- It might be better to use libtool for this, but I'm not ready to go that
  far yet.
This commit is contained in:
Ari Koivula 2015-07-29 13:05:56 +03:00
parent 81f5085136
commit 54b1be341e
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Makefile
View file

@ -38,7 +38,7 @@ INCLUDEDIRS = -I. -I./strategies -I./extras -I..
# nasm requires trailing slashes in include directories # nasm requires trailing slashes in include directories
ASFLAGS += $(patsubst %,%/,$(INCLUDEDIRS)) ASFLAGS += $(patsubst %,%/,$(INCLUDEDIRS))
CFLAGS += -O2 -g -Werror -ftree-vectorize -fpic -fvisibility=hidden -std=gnu99 CFLAGS += -O2 -g -Werror -ftree-vectorize -fvisibility=hidden -std=gnu99
CFLAGS += -DKVZ_DLL_EXPORTS CFLAGS += -DKVZ_DLL_EXPORTS
CFLAGS += $(INCLUDEDIRS) $(WARNINGS) CFLAGS += $(INCLUDEDIRS) $(WARNINGS)
LDFLAGS += -fvisibility=hidden -lm -pthread LDFLAGS += -fvisibility=hidden -lm -pthread
@ -214,6 +214,12 @@ TEST_OBJS := \
MAIN_OBJS := encmain.o interface_main.o MAIN_OBJS := encmain.o interface_main.o
RELEASE_OBJS = $(MAIN_OBJS) $(OBJS) RELEASE_OBJS = $(MAIN_OBJS) $(OBJS)
# Compile separate PIC objects for Linux/OSX.
ifeq ($(SYSTEM), Windows)
LIB_OBJS = $(OBJS)
else
LIB_OBJS = $(OBJS:.o=.lo)
endif
DEBUG_OBJS = $(RELEASE_OBJS:.o=_debug.o) DEBUG_OBJS = $(RELEASE_OBJS:.o=_debug.o)
TESTS_OBJS = $(TEST_OBJS) $(OBJS) TESTS_OBJS = $(TEST_OBJS) $(OBJS)
@ -231,9 +237,9 @@ tests: build_tests
build_tests: CFLAGS := $(filter-out -Werror, $(CFLAGS)) build_tests: CFLAGS := $(filter-out -Werror, $(CFLAGS))
build_tests: init_submodules $(TESTS) build_tests: init_submodules $(TESTS)
$(LIB): LDFLAGS += -shared -Wl,-soname,$(SO).$(VER_MAJOR) $(LIB): LDFLAGS += -shared -fpic -Wl,-soname,$(SO).$(VER_MAJOR)
$(DLL): LDFLAGS += -shared -Wl,--out-implib,$(IMPLIB) -o $@ $(DLL): LDFLAGS += -shared -Wl,--out-implib,$(IMPLIB) -o $@
$(DYLIB): LDFLAGS += -dynamiclib \ $(DYLIB): LDFLAGS += -dynamiclib -fpic \
-current_version $(VER_MAJOR).$(VER_MINOR).$(VER_RELEASE) \ -current_version $(VER_MAJOR).$(VER_MINOR).$(VER_RELEASE) \
-compatibility_version $(VER_MAJOR) \ -compatibility_version $(VER_MAJOR) \
-install_name $(LIBDIR)/$@ -install_name $(LIBDIR)/$@
@ -241,7 +247,7 @@ $(DYLIB): LDFLAGS += -dynamiclib \
$(PROG): $(RELEASE_OBJS) $(PROG): $(RELEASE_OBJS)
$(LD) $^ $(LDFLAGS) $(LIBS) -o $@ $(LD) $^ $(LDFLAGS) $(LIBS) -o $@
$(LIB) $(DLL) $(DYLIB): $(OBJS) $(LIB) $(DLL) $(DYLIB): $(LIB_OBJS)
$(LD) $^ $(LDFLAGS) $(LIBS) -o $@ $(LD) $^ $(LDFLAGS) $(LIBS) -o $@
$(DEBUG): $(DEBUG_OBJS) $(DEBUG): $(DEBUG_OBJS)
@ -250,12 +256,16 @@ $(DEBUG): $(DEBUG_OBJS)
$(TESTS): $(TESTS_OBJS) $(TESTS): $(TESTS_OBJS)
$(LD) $^ $(LDFLAGS) $(LIBS) -o $@ $(LD) $^ $(LDFLAGS) $(LIBS) -o $@
%.o %_debug.o: %.asm Makefile # Hopefully the ASM code is PIC. If not, we have to disable for the .so and .dylib.
%.o %_debug.o %.lo %_debug.lo: %.asm Makefile
$(AS) $(ASFLAGS) -o $@ $< $(AS) $(ASFLAGS) -o $@ $<
%.o %_debug.o: %.c Makefile %.o %_debug.o: %.c Makefile
$(CC) $(CFLAGS) $(EXTRA_FLAGS) -MMD -MP -c $< -o $@ $(CC) $(CFLAGS) $(EXTRA_FLAGS) -MMD -MP -c $< -o $@
%.lo %_debug.lo: %.c Makefile
$(CC) -fpic $(CFLAGS) $(EXTRA_FLAGS) -MMD -MP -c $< -o $@
kvazaar.pc: kvazaar.pc.in Makefile kvazaar.pc: kvazaar.pc.in Makefile
sed -e "s;@prefix@;$(PREFIX);" -e "s;@libdir@;$(LIBDIR);" \ sed -e "s;@prefix@;$(PREFIX);" -e "s;@libdir@;$(LIBDIR);" \
-e "s;@VERSION@;$(VER_MAJOR).$(VER_MINOR).$(VER_RELEASE);" \ -e "s;@VERSION@;$(VER_MAJOR).$(VER_MINOR).$(VER_RELEASE);" \
@ -299,7 +309,7 @@ install-dll: $(DLL)
$(INSTALL) -m644 $(IMPLIB) $(DESTDIR)$(LIBDIR) $(INSTALL) -m644 $(IMPLIB) $(DESTDIR)$(LIBDIR)
clean: clean:
$(RM) $(RELEASE_OBJS) $(DEBUG_OBJS) $(TESTS_OBJS) $(DEPS) $(RM) $(RELEASE_OBJS) $(LIB_OBJS) $(DEBUG_OBJS) $(TESTS_OBJS) $(DEPS)
$(RM) $(PROG) $(DEBUG) $(TESTS) $(LIB) $(DLL) $(IMPLIB) $(DYLIB) $(RM) $(PROG) $(DEBUG) $(TESTS) $(LIB) $(DLL) $(IMPLIB) $(DYLIB)
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)