diff options
| author | jstebbins <[email protected]> | 2009-10-13 15:26:07 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-10-13 15:26:07 +0000 |
| commit | c7909c14eb06e4f11880f122dfb032b57a71398c (patch) | |
| tree | 70b457ed5bf3e26f7afd07deedb5fe342e4989de | |
| parent | 196e7314a9287809f5a2fb2f75f5a312c14ab17c (diff) | |
build system: solaris 10 support
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2882 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | make/include/main.defs | 4 | ||||
| -rw-r--r-- | make/variant/solaris.defs | 2 | ||||
| -rw-r--r-- | test/module.defs | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/make/include/main.defs b/make/include/main.defs index 90891664e..3228593ba 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -40,6 +40,10 @@ ifneq (,$(filter $(BUILD.system),cygwin mingw)) MODULES += contrib/zlib endif +ifneq (,$(filter $(BUILD.system),solaris)) + MODULES += contrib/libiconv +endif + ## these must come after contrib since some contrib modules are optional MODULES += libhb diff --git a/make/variant/solaris.defs b/make/variant/solaris.defs index 251debcf4..e82ceaded 100644 --- a/make/variant/solaris.defs +++ b/make/variant/solaris.defs @@ -1,6 +1,8 @@ TARGET.dylib.ext = .so GCC.args.dylib = -shared +GCC.args.strip = -Wl,-s +GCC.args.extra += -Wl,-z,rescan GCC.args.pic = 1 GCC.args.g.none = -g0 diff --git a/test/module.defs b/test/module.defs index 947bc1591..e9bc7b791 100644 --- a/test/module.defs +++ b/test/module.defs @@ -43,6 +43,8 @@ ifeq ($(BUILD.system),darwin) TEST.GCC.l += iconv bz2 z else ifeq ($(BUILD.system),linux) TEST.GCC.l += bz2 z pthread dl m +else ifeq ($(BUILD.system),solaris) + TEST.GCC.l += bz2 z pthread nsl socket else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a TEST.GCC.D += PTW32_STATIC_LIB |