mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate SYNAMIC_CRT and use_shl_version

Browse Source
This commit is contained in:
Norbert Thiebaud
2012-01-18 15:38:42 -06:00
parent 9d8d10cecc
commit 45d211b599
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config_host.mk.in
View File

@@ -71,6 +71,7 @@ export DOCDIR="@DOCDIR@"
export DOXYGEN="@DOXYGEN@" export DOXYGEN="@DOXYGEN@"
export DO_FETCH_TARBALLS="@DO_FETCH_TARBALLS@" export DO_FETCH_TARBALLS="@DO_FETCH_TARBALLS@"
export DPKG="@DPKG@" export DPKG="@DPKG@"
export DYNAMIC_CRT="@DYNAMIC_CRT@"
export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@" export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@" export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
export ENABLE_DBUS="@ENABLE_DBUS@" export ENABLE_DBUS="@ENABLE_DBUS@"
@@ -391,6 +392,7 @@ export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@" export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
export UPD="@UPD@" export UPD="@UPD@"
export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@" export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
export use_shl_version="@use_shl_version@"
export USE_XINERAMA="@USE_XINERAMA@" export USE_XINERAMA="@USE_XINERAMA@"
export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@" export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
export VALIDATOR_EXTENSION_PACK="@VALIDATOR_EXTENSION_PACK@" export VALIDATOR_EXTENSION_PACK="@VALIDATOR_EXTENSION_PACK@"

6
configure.in
View File

@@ -215,7 +215,8 @@ cygwin*|interix*|mingw32*)
test_freetype=no test_freetype=no
test_fontconfig=no test_fontconfig=no
_os=WINNT _os=WINNT
use_shl_version="TRUE"
DYNAMIC_CRT="TRUE"
# If the host OS matches "mingw32*", that means we are using the # If the host OS matches "mingw32*", that means we are using the
# MinGW cross-compiler, because we don't see the point in building # MinGW cross-compiler, because we don't see the point in building
# LibreOffice using MinGW on Windows. If you want to build on # LibreOffice using MinGW on Windows. If you want to build on
@@ -362,6 +363,9 @@ if test "$_os" = "AIX"; then
fi fi
fi fi
AC_SUBST(use_shl_version)
AC_SUBST(DYNAMIC_CRT)
AC_SUBST(WITH_MINGW) AC_SUBST(WITH_MINGW)
AC_SUBST(OSVERSION) AC_SUBST(OSVERSION)
AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_CFLAGS)

5
set_soenv.in
View File

@@ -51,7 +51,6 @@ my ( $SOLAR_JAVA,
# Platform dependent constant values. # Platform dependent constant values.
my ( my (
$OUTPATH, $INPATH, $OUTPATH, $INPATH,
$DYNAMIC_CRT, $use_shl_versions );
# #
#------------------------------------------- #-------------------------------------------
# IIc. Declaring the environment variables. # IIc. Declaring the environment variables.
@@ -172,8 +171,6 @@ if ( $platform =~ m/cygwin|mingw32/ )
$DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@'); $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
$USE_DIRECTX5 = ""; $USE_DIRECTX5 = "";
$DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@'); $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
$DYNAMIC_CRT = "TRUE";
$use_shl_versions = "TRUE";
$wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator $wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
} }
elsif ( $platform =~ m/darwin/ ) elsif ( $platform =~ m/darwin/ )
@@ -729,8 +726,6 @@ ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" );
# (c = comment, e = environment variable, a = alias ) # (c = comment, e = environment variable, a = alias )
ToFile( "Platform dependent constant values.", $empty, "c" ); ToFile( "Platform dependent constant values.", $empty, "c" );
ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" ); ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
ToFile( "DYNAMIC_CRT", $DYNAMIC_CRT, "e" );
ToFile( "use_shl_versions", $use_shl_versions, "e" );
# #
# Writing the variables to file. # Writing the variables to file.