diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-27 14:05:28 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-27 14:05:28 -0500 |
| commit | 64914e407ccac91fbbaa5022a6854be9a01027f8 (patch) | |
| tree | 45a106187fd8ec80240286798b7982eb1cb6c686 /scp2/AutoInstall.mk | |
| parent | 6b7d31810b5198ab17ddaccda41e94b253ff2a25 (diff) | |
vs2012 express support.
vs2012 express does not have atl so one need to
--disable-atl and --disable-activex
but then the packaging still try to include a few _x64.dll
that are not built.
Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6
Diffstat (limited to 'scp2/AutoInstall.mk')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index bc3e8d847618..5c55a3e6595e 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -35,8 +35,10 @@ $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600")) +ifeq ($(BUILD_X64),TRUE) $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64")) $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600")) +endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) # vim: set noet sw=4 ts=4: |