diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2012-03-08 16:22:16 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2012-03-08 16:22:16 +0000 |
| commit | 7024af2ca31ff952232fe20cf37fb0afd69d237a (patch) | |
| tree | 7738e00fd91cfe111e12bc4376ba0aa857bae8cd /scp2 | |
| parent | 6076a9a1784f654a432b622467a66aac128c775d (diff) | |
119004: pack vc redistributavles under Windows only
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 8a1b9342b376..8010485dbea6 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -271,7 +271,7 @@ SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA SCPDEFS+=-DENABLE_SVCTAGS .ENDIF -.IF "$(WITH_VC_REDIST)" == "TRUE" +.IF "$(WITH_VC_REDIST)" == "YES" SCPDEFS+=-DWITH_VC_REDIST .ENDIF diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index ca213e6c9839..4fe73bc7c1d8 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -26,21 +26,13 @@ #if defined(WITH_VC_REDIST) ScpAction scp_Copy_vcredist_x86 - #if defined(BUILD_SPECIAL) - Copy = "vcredist_x86_9.0.30729.4148.exe"; - #else Copy = "vcredist_x86.exe"; - #endif Name = "vcredist_x86.exe"; Subdir = "redist"; End ScpAction scp_Copy_vcredist_x64 - #if defined(BUILD_SPECIAL) - Copy = "vcredist_x64_9.0.30729.4148.exe"; - #else Copy = "vcredist_x64.exe"; - #endif Name = "vcredist_x64.exe"; Subdir = "redist"; End |