#100000# do not link -lpyton fr linux (SB)
This commit is contained in:
@@ -2,9 +2,9 @@
|
|||||||
#
|
#
|
||||||
# $RCSfile: makefile.mk,v $
|
# $RCSfile: makefile.mk,v $
|
||||||
#
|
#
|
||||||
# $Revision: 1.5 $
|
# $Revision: 1.6 $
|
||||||
#
|
#
|
||||||
# last change: $Author: kz $ $Date: 2004-02-27 15:16:46 $
|
# last change: $Author: kz $ $Date: 2004-03-01 11:38:50 $
|
||||||
#
|
#
|
||||||
# The Contents of this file are made available subject to the terms of
|
# The Contents of this file are made available subject to the terms of
|
||||||
# either of the following licenses
|
# either of the following licenses
|
||||||
@@ -63,6 +63,8 @@ PRJNAME=pyuno
|
|||||||
TARGET=pyuno
|
TARGET=pyuno
|
||||||
ENABLE_EXCEPTIONS=TRUE
|
ENABLE_EXCEPTIONS=TRUE
|
||||||
|
|
||||||
|
LINKFLAGSDEFS = # do not fail with missing symbols
|
||||||
|
|
||||||
# --- Settings -----------------------------------------------------
|
# --- Settings -----------------------------------------------------
|
||||||
|
|
||||||
.INCLUDE : settings.mk
|
.INCLUDE : settings.mk
|
||||||
@@ -82,7 +84,9 @@ PYUNO_MODULE=$(DLLDEST)$/pyuno$(DLLPOST)
|
|||||||
# so this library cannot be checked
|
# so this library cannot be checked
|
||||||
SHL1NOCHECK=yes
|
SHL1NOCHECK=yes
|
||||||
PYUNORC=pyunorc
|
PYUNORC=pyunorc
|
||||||
|
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
|
||||||
PYTHONLIB=-lpython
|
PYTHONLIB=-lpython
|
||||||
|
.ENDIF
|
||||||
.ELSE
|
.ELSE
|
||||||
# on windows, the python executable also uses the shared library,
|
# on windows, the python executable also uses the shared library,
|
||||||
# so we link pyuno directly to it
|
# so we link pyuno directly to it
|
||||||
|
Reference in New Issue
Block a user