diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-17 13:44:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-17 13:44:18 +0200 |
| commit | e3d5d7185df622151e4c3e3903e513bcabde01ac (patch) | |
| tree | c0b2a89f55f4bc41bf4c05b251bbbb4c2ec3e5bf /scp2/source/ooo/makefile.mk | |
| parent | b1fd3cc07a1ada4a88f589c91292556a3e5a1705 (diff) | |
| parent | d75defa37fb46aedd81e6d6c360375e37e8473e7 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
Makefile.in
bootstrap.1
configure.in
solenv/inc/minor.mk
Diffstat (limited to 'scp2/source/ooo/makefile.mk')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index f27828489d64..1504a2ac14f0 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC SCPDEFS+=-DBUILD_SPECIAL .ENDIF +.IF "$(ENABLE_ONLINE_UPDATE)"!="" +SCPDEFS+=-DENABLE_ONLINE_UPDATE +.ENDIF + .IF "$(BUILD_X64)"!="" SCPDEFS+=-DBUILD_X64 .ENDIF |