diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:08 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:08 +0200 |
| commit | e72584561e2a2b801b06af9c2775c82afef70563 (patch) | |
| tree | a00b2bffa7dcb67c44789086d9f111f2664e2580 /set_soenv.in | |
| parent | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (diff) | |
| parent | ad4a4673baf22ccd07e522d5ec0795f79e2584b9 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index 569a867f4677..724af0e11ec0 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1065,7 +1065,7 @@ if ($platform =~ m/cygwin/) } $ILIB .= $wps.PathFormat("@MINGW_CLIB_DIR@"). $wps.$WINDOWS_SDK_HOME.$LIB; - if ( '@ENABLE_DIRETX@' ) + if ( '@ENABLE_DIRECTX@' ) { $ILIB .= $wps.PathFormat("@DIRECTXSDK_LIB@"); } } @@ -1771,6 +1771,7 @@ if ( '@CROSS_COMPILING@' ne '' ) ToFile( "CXX_FOR_BUILD", "@CXX_FOR_BUILD@", "e" ); ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" ); ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" ); + ToFile( "ICU_NATIVE_BUILD_ROOT", "@ICU_NATIVE_BUILD_ROOT@", "e"); } else { |