diff options
| author | Kent Mein <mein@cs.umn.edu> | 2007-12-05 19:58:52 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2007-12-05 19:58:52 +0300 |
| commit | 7b2e348d4f0252470f0ee484d812a264d5a86fc3 (patch) | |
| tree | f45b343af1600761ff269dca18a7b0d4f3b2cdcc /source/nan_link.mk | |
| parent | b3c1e458b43d4014bc720c7eb20af5e02f6f5ab5 (diff) | |
This is a modified version of this patch:
[#7660] Solaris 10 x86 support (Makefiles)
Hopefully it will not mess up anything for anyone else. I removed
some hardcoded static libs and made NAN_*_LIB definitions so they could be
overridden, to allow greater flexability.
Let me know if there are any problems/questions.
Kent
Diffstat (limited to 'source/nan_link.mk')
| -rw-r--r-- | source/nan_link.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/nan_link.mk b/source/nan_link.mk index e6824643a04..35a0a9d0070 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -52,7 +52,6 @@ SOEXT = .so ifeq ($(OS),beos) LLIBS = -L/boot/develop/lib/x86/ -lGL -lbe -L/boot/home/config/lib/ - LLIBS += -lpython1.5 endif ifeq ($(OS),darwin) @@ -118,7 +117,10 @@ ifeq ($(OS),openbsd) endif ifeq ($(OS),solaris) - LLIBS = -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl + ifeq ($(CPU), i386) + LLIBS = -L/usr/X11/lib + endif + LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl DYNLDFLAGS = -shared $(LDFLAGS) endif @@ -162,3 +164,9 @@ endif ifeq ($(WITH_FFMPEG),true) LLIBS += $(NAN_FFMPEGLIBS) endif + +ifeq ($(INTERNATIONAL),true) + LLIBS += $(NAN_GETTEXT_LIB) +endif + +LLIBS += $(NAN_PYTHON_LIB) |