diff options
| author | Bradley Sepos <[email protected]> | 2018-06-01 17:08:13 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-17 00:23:34 -0400 |
| commit | ca57c61aab7e10aa809ec84d3076a07c63bcb410 (patch) | |
| tree | 3ca055d3582765b071517530feaad40e675c6890 /libhb | |
| parent | e910330e6a022f8267b61be940fc03a01fee2109 (diff) | |
contrib: gtk: libhb: make: scripts: Remove yasm contrib.
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/module.defs | 23 | ||||
| -rw-r--r-- | libhb/module.rules | 15 |
2 files changed, 2 insertions, 36 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index 6afb6f403..bc760b308 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -105,29 +105,6 @@ endif ############################################################################### -## when defined this gives us the subdir name, or flavor of asm implementation -ifneq (disabled,$(FEATURE.asm)) - -LIBHB.yasm.src/ = $(LIBHB.src/)$(FEATURE.asm)/ -LIBHB.yasm.build/ = $(LIBHB.build/)$(FEATURE.asm)/ -LIBHB.yasm.asm = $(LIBHB.yasm.src/)deinterlace-a.asm -LIBHB.yasm.o = $(LIBHB.yasm.asm:$(LIBHB.yasm.src/)%.asm=$(LIBHB.yasm.build/)%.o) -LIBHB.yasm.d = $(wildcard $(LIBHB.yasmsrc/)*.h) - -LIBHB.YASM.I = $(LIBHB.yasm.src/) -LIBHB.YASM.ASM_O = $(strip $(YASM.exe) \ - -f $(LIBHB.YASM.f) \ - -m $(LIBHB.YASM.m) \ - $(LIBHB.YASM.D:%=-D%) \ - $(LIBHB.YASM.I:%=-I%) \ - -o $(1) $(2)) - -LIBHB.out += $(LIBHB.yasm.o) - -endif - -############################################################################### - ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) LIBHB.dll = $(LIBHB.build/)hb.dll diff --git a/libhb/module.rules b/libhb/module.rules index 80828577c..91dc7833f 100644 --- a/libhb/module.rules +++ b/libhb/module.rules @@ -3,7 +3,7 @@ $(eval $(call import.MODULE.rules,LIBHB)) libhb.build: $(LIBHB.a) $(LIBHB.a): | $(dir $(LIBHB.a)) -$(LIBHB.a): $(LIBHB.c.o) $(LIBHB.m.o) $(LIBHB.yasm.o) +$(LIBHB.a): $(LIBHB.c.o) $(LIBHB.m.o) $(AR.exe) rsu $@ $^ $(LIBHB.c.o): $(LIBHB.d) @@ -28,23 +28,12 @@ libhb.clean: ############################################################################### -ifneq (disabled,$(FEATURE.asm)) - -$(LIBHB.yasm.o): $(LIBHB.yasm.d) -$(LIBHB.yasm.o): | $(dir $(LIBHB.yasm.o)) -$(LIBHB.yasm.o): $(LIBHB.yasm.build/)%.o: $(LIBHB.yasm.src/)%.asm - $(call LIBHB.YASM.ASM_O,$@,$<) - -endif - -############################################################################### - ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) libhb.build: $(LIBHB.dll) $(LIBHB.dll): | $(dirname $(LIBHB.dll) $(LIBHB.lib)) -$(LIBHB.dll): $(LIBHB.c.o) $(LIBHB.yasm.o) +$(LIBHB.dll): $(LIBHB.c.o) $(call LIBHB.GCC.DYLIB++,$@,$^ $(LIBHB.dll.libs)) ifeq (none,$(FFMPEG.GCC.g)) $(STRIP.exe) -s $(LIBHB.dll) |