Author: hdu
Date: Thu Jan 23 16:58:26 2014
New Revision: 1560747
URL: http://svn.apache.org/r1560747
Log:
#i122301# switch Mac port to SDK 10.7 / 64bit
Modified:
openoffice/trunk/main/configure.in
openoffice/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
openoffice/trunk/main/nss/makefile.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/scaddins/source/analysis/analysishelper.hxx
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/inc/_tg_app.mk
openoffice/trunk/main/solenv/inc/tg_app.mk
openoffice/trunk/main/solenv/inc/unxmacc.mk
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Thu Jan 23 16:58:26 2014
@@ -1679,6 +1679,7 @@ if test "$COMPATH" = "." ; then
dnl double square bracket to get single because of M4 quote...
COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
fi
+CC_PATH="$COMPATH/"
COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
dnl ===================================================================
@@ -1700,20 +1701,8 @@ if test \( "$_os" != "WINNT" -o "$WITH_M
fi
fi
fi
- if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
- if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
- export CC=$GCC_HOME/bin/gcc-4.0
- dnl export CC to have it available in set_soenv -> config.guess
- GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3
}'`
- if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
- GCCVER=$GCCVER2
- fi
- fi
- if test "$GCCVER" -ge "040100" ; then
- AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version
won't work with the MacOSX10.4u.sdk) - set CC accordingly])
- else
+ if test "$_os" = "Darwin" ; then
AC_MSG_RESULT([implicitly using CC=$CC])
- fi
else
AC_MSG_RESULT([checked (gcc $_gcc_version)])
fi
@@ -1798,16 +1787,12 @@ dnl ====================================
dnl Search for a pre-installed dmake
dnl ===================================================================
AC_MSG_CHECKING([for dmake])
-DMAKE="no"
-# Override system dmake if --with-dmake-path or --with-dmake-url is used.
-if test -z "$with_dmake_path" && test -z "$with_dmake_url"; then
- AC_PATH_PROG(DMAKE, dmake, no)
- IS_SYSTEM_DMAKE=NO
- if test "$DMAKE" != "no"; then
- AC_MSG_RESULT([using system dmake])
- DMAKE_PATH="$DMAKE"
- IS_SYSTEM_DMAKE=YES
- fi
+AC_PATH_PROG(DMAKE, dmake, no)
+IS_SYSTEM_DMAKE=NO
+if test "$DMAKE" != "no"; then
+ AC_MSG_RESULT([using system dmake])
+ DMAKE_PATH="$DMAKE"
+ IS_SYSTEM_DMAKE=YES
elif test -n "$with_dmake_path" ; then
# Did not find pre-installed dmake.
# Is it at a nonstandard location provided by --with-dmake-path ?
@@ -2364,22 +2349,7 @@ if test "$GXX" = "yes"; then
_gpp_version=`$CXX -dumpversion`
_gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
- if test "$_os" = "Darwin" -a "$_gpp_majmin" -ge "401" ; then
- if test -z "$save_CXX" -a -x "$GCC_HOME/bin/g++-4.0" ; then
- CXX=$GCC_HOME/bin/g++-4.0
- _gpp_majmin_2=`"$CXX" -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'`
- if test "$_gpp_majmin_2" -ge "400" -a "$_gpp_majmin_2" -lt "401" ;
then
- _gpp_majmin=$_gpp_majmin_2
- fi
- fi
- if test "$_gpp_majmin" -ge "401" ; then
- AC_MSG_ERROR([You need to use the g++-4.0 compiler (g++ $_gpp_version
won't work with the MacOSX10.4u.sdk) - set CXX accordingly])
- else
- AC_MSG_RESULT([implicitly using CXX=$CXX])
- fi
- else
- AC_MSG_RESULT([checked (g++ $_gpp_version)])
- fi
+ AC_MSG_RESULT([checked (g++ $_gpp_version)])
if test "$_gpp_majmin" = "304"; then
AC_MSG_CHECKING([whether $CXX has the enum bug])
@@ -3812,7 +3782,7 @@ if test -n "$with_system_cppunit" -o -n
PKG_CHECK_MODULES( CPPUNIT,
cppunit >= 1.12.0,
WITH_CPPUNIT="YES",
- WITH_CPPUNIT=")
+ WITH_CPPUNIT="")
if test -n "$WITH_CPPUNIT"; then
AC_MSG_RESULT([found system cppunit $CPPUNIT])
else
@@ -3951,15 +3921,15 @@ if test "$_os" = "Darwin" && test "$with
dnl hex version of Python 2.7.1 = 34013680
if test $_python_hexversion -ge 34013680 ; then
- _python_version=`$_python -c "import sys; print sys.version;" | head
-n 1`
+ _python_version=`$_python -c "import sys; print sys.version;" | head
-c 3`
AC_MSG_RESULT([compiling against system python (version
$_python_version)])
_python_ver=`$_python -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('VERSION'));"`
if test -d
"/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver";
then
PYTHON_CFLAGS="-I/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
- elif test -d
"/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver";
then
-
PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
+ elif test -d
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/include/python$_python_ver";
then
+
PYTHON_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/include/python$_python_ver"
else
PYTHON_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
fi
@@ -3972,7 +3942,7 @@ elif test -n "$with_system_python" -o -n
test "$with_system_python" != "no"; then
with_system_python=yes
AC_MSG_RESULT([external])
- AM_PATH_PYTHON([2.3])
+ AM_PATH_PYTHON([2.7])
python_include=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
python_version=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('VERSION'));"`
@@ -7278,6 +7248,7 @@ if test -z "$COMPATH"; then
AC_MSG_ERROR([No compiler found.])
fi
AC_SUBST(COMPATH)
+AC_SUBST(CC_PATH)
AC_MSG_CHECKING([solver path])
if test -z "$with_local_solver"; then
Modified:
openoffice/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
---
openoffice/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
(original)
+++
openoffice/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
Thu Jan 23 16:58:26 2014
@@ -266,7 +266,7 @@ sal_Int16 MacSpellChecker::GetSpellFailu
aLang = [aLang stringByAppendingString:aTaggedCountry];
}
- int aCount;
+ NSInteger aCount;
NSRange range = [macSpell checkSpellingOfString:aNSStr startingAt:0
language:aLang wrap:sal_False inSpellDocumentWithTag:macTag wordCount:&aCount];
int rVal = 0;
if(range.length>0)
Modified: openoffice/trunk/main/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/nss/makefile.mk (original)
+++ openoffice/trunk/main/nss/makefile.mk Thu Jan 23 16:58:26 2014
@@ -45,7 +45,7 @@ TARFILE_ROOTDIR=nss-3.14.4
PATCH_FILES=nss.patch
.IF "$(OS)"=="MACOSX"
-MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
+MACOS_SDK_DIR=$(SDK_PATH)
.EXPORT : MACOS_SDK_DIR
PATCH_FILES+=nss_macosx.patch
.ENDIF # "$(OS)"=="MACOSX"
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Thu Jan 23
16:58:26 2014
@@ -314,7 +314,7 @@ my_components += \
macab1 \
macbe1 \
MacOSXSpell
-.IF "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+.IF "${MACOSX_DEPLOYMENT_TARGET}" == ""
my_components += avmediaQuickTime
.END
.END
Modified: openoffice/trunk/main/scaddins/source/analysis/analysishelper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/source/analysis/analysishelper.hxx?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/scaddins/source/analysis/analysishelper.hxx (original)
+++ openoffice/trunk/main/scaddins/source/analysis/analysishelper.hxx Thu Jan
23 16:58:26 2014
@@ -35,15 +35,7 @@
#include <math.h>
-// STLport definitions
-// This works around some issues with Boost
-//
-#ifdef WNT
-#define _STLP_HAS_NATIVE_FLOAT_ABS
-#endif
-
#include <boost/tr1/complex.hpp>
-using namespace boost::math;
#ifndef double_complex
typedef std::complex<double> double_complex;
#endif
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Thu Jan 23
16:58:26 2014
@@ -600,14 +600,14 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
End
-#if MACOSX_DEPLOYMENT_TARGET<107
+#if (MACOSX_DEPLOYMENT_TARGET_NUM < 106)
File gid_File_Lib_avmediaQuickTime
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(avmediaQuickTime);
Dir = SCP2_OOO_BIN_DIR;
End
-#endif // MACOSX_DEPLOYMENT_TARGET
+#endif // MACOSX_DEPLOYMENT_TARGET_NUM
#endif // MACOSX
#ifdef OS2
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Thu Jan 23 16:58:26 2014
@@ -307,7 +307,7 @@ SCPDEFS+=-DSYSTEM_PANGO
.ENDIF
.IF "${MACOSX_DEPLOYMENT_TARGET}" != ""
-SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:s/.//}
+SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET_NUM=${MACOSX_DEPLOYMENT_TARGET:s/.//}
.ENDIF
# The variables ENABLE_ONLINE_UPDATE, WITHOUT_MATHMLDTD, WITH_CATA_FONTS,
WITH_CATB_FONTS,
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Thu Jan 23 16:58:26 2014
@@ -20,13 +20,7 @@
# under the License.
#
###############################################################
-#
-# Program: set_soenv.in
-# Version: $Revision: 1.201 $
-# Date: $Date: 2008-09-05 14:14:29 $
-# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun
Microsystems, Ireland.
-#
-#---------------------------------------------------------------------------
+
#---------------------------------------------------------------------------
# Description:
# set_soenv generates a file that contains all necessary
@@ -102,7 +96,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR,
$SOLARENV,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON,
$STAR_SSOLARINI,
$DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $CXX_X64_BINARY,
$LINK_X64_BINARY, $LIBMGR_X64_BINARY,
- $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
+ $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SDK_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK,
$FRAME_HOME,
@@ -952,16 +946,6 @@ if ( $platform =~ m/os2/ )
$PERL_PATH = '';
}
-# Mac OS X/Darwin only variables.
-if ( $platform =~ m/darwin/ )
-{ $FRAMEWORKSHOME =
$ds."Developer".$ds."SDKs".$ds."MacOSX10.4u.sdk".$ds."System".$ds."Library".$ds."Frameworks";
- if ( $XLIB eq "no_x_libraries" ) {
- $GUIBASE = "aqua";
- } else {
- $GUIBASE = "unx";
- }
-}
-
# The project's workstamp.
$WORK_STAMP = "@SOURCEVERSION@";
# Location of the source.
@@ -1456,7 +1440,11 @@ elsif ($platform =~ m/cygwin/)
}
elsif ($platform =~ m/darwin/)
{
- $SOLARINC .= " " . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+ $SDK_PATH =
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk";
+ $FRAMEWORKSHOME = $SDK_PATH."/System/Library/Frameworks";
+ my $STLINC .=
$I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ $SOLARINC .= $STLINC .
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+ $GUIBASE = "aqua";
}
else
{ AddWarning( "set_soenv", "$platform not configured for system dependant
include dir" );
@@ -1658,6 +1646,7 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA
ToFile( "BIG_SVX", $BIG_SVX, "e" );
ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
+ToFile( "CC_PATH", "@CC_PATH@", "e" );
ToFile( "CXX_X64_BINARY", $CXX_X64_BINARY, "e" );
ToFile( "LINK_X64_BINARY", $LINK_X64_BINARY, "e" );
ToFile( "LIBMGR_X64_BINARY", $LIBMGR_X64_BINARY, "e" );
@@ -1689,7 +1678,8 @@ if ( $platform =~ m/darwin/ )
# unless you want to do runtime checks for 10.5 api, you also want to use the
10.7 sdk
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
- ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" );
+ ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.7", "e" );
+ ToFile( "SDK_PATH", $SDK_PATH, "e" );
}
#
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Thu Jan 23 16:58:26
2014
@@ -22,7 +22,8 @@
GUI := UNX
-COM := GCC
+COM := S5ABI
+COMID := s5abi
#COM := S5ABI
#COMID := s5abi
@@ -70,9 +71,9 @@ gb_CPUDEFS := -DX86_64
endif
ifeq ($(strip $(SYSBASE)),)
-gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
+gb_SDKDIR := $(SDK_PATH)
else
-gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
+gb_SDKDIR := $(SYSBASE)/MacOSX10.7.sdk
endif
@@ -102,6 +103,10 @@ gb_CXXFLAGS := \
-fsigned-char \
-pipe
+ifneq ($(COM),GCC)
+ gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
+endif
+
# these are to get g++ to switch to Objective-C++ mode
# (see toolkit module for a case where it is necessary to do it this way)
gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
Modified: openoffice/trunk/main/solenv/inc/_tg_app.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_app.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/_tg_app.mk (original)
+++ openoffice/trunk/main/solenv/inc/_tg_app.mk Thu Jan 23 16:58:26 2014
@@ -19,7 +19,7 @@
#
# *************************************************************
-CC_PATH*=""
+CC_PATH*="$(CC_PATH)"
# unroll begin
Modified: openoffice/trunk/main/solenv/inc/tg_app.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_app.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_app.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_app.mk Thu Jan 23 16:58:26 2014
@@ -19,7 +19,7 @@
#
#**************************************************************
-CC_PATH*=""
+CC_PATH*="$(CC_PATH)"
#######################################################
# instructions for linking
Modified: openoffice/trunk/main/solenv/inc/unxmacc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacc.mk?rev=1560747&r1=1560746&r2=1560747&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacc.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacc.mk Thu Jan 23 16:58:26 2014
@@ -43,7 +43,7 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRAN
#MACOSX_DEPLOYMENT_TARGET=10.7
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+=-DQUARTZ
-EXTRA_CDEFS*=-isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+EXTRA_CDEFS*=-isysroot $(SDK_PATH)
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
@@ -169,9 +169,7 @@ LINK*=$(CXX)
LINKC*=$(CC)
###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-# assure backwards-compatibility
-###EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
-EXTRA_LINKFLAGS*=-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+EXTRA_LINKFLAGS*=-L$(SDK_PATH)
# Very long install_names are needed so that install_name_tool -change later on
# does not complain that "larger updated load commands do not fit:"
LINKFLAGSRUNPATH_URELIB=-install_name
'@__________________________________________________URELIB/$(@:f)'
@@ -184,13 +182,8 @@ LINKFLAGSRUNPATH_BOXT=
LINKFLAGSRUNPATH_NONE=-install_name
'@__________________________________________________NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
-# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library
into our link line
-.IF "$(GUIBASE)" == "aqua"
- LINKFLAGS+=-lobjc
- # Sometimes we still use files that would be in a GUIBASE="unx"
specific directory
- # because they really aren't GUIBASE specific, so we've got to account
for that here.
- INCGUI+= -I$(PRJ)/unx/inc
-.ENDIF
+LINKFLAGS+=-lobjc
+LINKFLAGS+=-lc++
#special settings form environment
LINKFLAGS+=$(EXTRA_LINKFLAGS)
@@ -224,8 +217,6 @@ LINKVERSIONMAPFLAG=-Wl,-map -Wl,
SONAME_SWITCH=-Wl,-h
-### STDLIBCPP=-stdlib=libc++
-STDLIBCPP=-lc++
STDOBJVCL=$(L)/salmain.o
STDOBJGUI=
@@ -233,17 +224,10 @@ STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
-.IF "$(GUIBASE)" == "aqua"
- STDLIBCUIMT=CPPRUNTIME -lm
- STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm
- STDSHLCUIMT=-lpthread CPPRUNTIME -lm
- STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework
Cocoa -lpthread CPPRUNTIME -lm
-.ELSE
- STDLIBCUIMT= CPPRUNTIME -lm
- STDLIBGUIMT=-lX11 -lpthread CPPRUNTIME -lm
- STDSHLCUIMT=-lpthread CPPRUNTIME -lm
- STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework
CoreFoundation
-.ENDIF
+#STDLIBCUIMT=CPPRUNTIME -lm
+#STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm
+STDSHLCUIMT=-lpthread CPPRUNTIME -lm
+STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa
-lpthread CPPRUNTIME -lm
LIBMGR=ar
LIBFLAGS=-r
