summaryrefslogtreecommitdiffstats
path: root/libhb/module.defs
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-04-19 14:38:38 +0000
committerjstebbins <[email protected]>2015-04-19 14:38:38 +0000
commit76308dc3563db85da5a3daae74014637423cb249 (patch)
treec53612b2947e5eef6e896cbac8d6cb2340a99b72 /libhb/module.defs
parent2b0b91800b4e3461f0b9c1d8c3070968b1b9fe90 (diff)
ports: add functions for looking up user config directory
These will be used by the CLI for loading custom user presets. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7105 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/module.defs')
-rw-r--r--libhb/module.defs5
1 files changed, 4 insertions, 1 deletions
diff --git a/libhb/module.defs b/libhb/module.defs
index 79222a2fa..445d66433 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -15,6 +15,7 @@ LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in))
LIBHB.c = $(wildcard $(LIBHB.src/)*.c)
LIBHB.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(LIBHB.c))
+LIBHB.m.o = $(patsubst $(SRC/)%.m,$(BUILD/)%.o,$(LIBHB.m))
LIBHB.d = $(LIBHB.m4.out) $(LIBHB.h.out) \
$(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) )
@@ -30,6 +31,7 @@ LIBHB.a = $(LIBHB.build/)$(call TARGET.archive,handbrake)
LIBHB.out += $(LIBHB.m4.out)
LIBHB.out += $(LIBHB.c.o)
+LIBHB.out += $(LIBHB.m.o)
LIBHB.out += $(LIBHB.h.out)
LIBHB.out += $(LIBHB.a)
@@ -50,6 +52,7 @@ ifeq ($(BUILD.system),cygwin)
else ifeq ($(BUILD.system),darwin)
LIBHB.GCC.D += SYS_DARWIN
LIBHB.c += $(wildcard $(LIBHB.src/)platform/macosx/*.c)
+ LIBHB.m += $(wildcard $(LIBHB.src/)platform/macosx/*.m)
else ifeq ($(BUILD.system),linux)
LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
else ifeq ($(BUILD.system),mingw)
@@ -168,7 +171,7 @@ else
endif
LIBHB.GCC.args.extra.dylib++ += -Wl,--out-implib,$(LIBHB.lib)
-LIBHB.GCC.l += ws2_32
+LIBHB.GCC.l += ws2_32 uuid
ifeq ($(HAS.dlfcn),1)
LIBHB.GCC.l += dl
endif