diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 11:00:35 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 11:01:45 +0200 |
| commit | 558ebfde8d102ebc298ea887db86ae2918a9a7ab (patch) | |
| tree | e6ad02f26e3b0e81f129b9070c4fe84913aa56a6 /desktop/Executable_soffice.mk | |
| parent | For now, keep the Mac OS X duplication of soffice.bin as soffice in installat... (diff) | |
| download | core-558ebfde8d102ebc298ea887db86ae2918a9a7ab.tar.gz core-558ebfde8d102ebc298ea887db86ae2918a9a7ab.zip | |
Avoid officeloader -> soffice renaming dance, build that directly.
Diffstat (limited to 'desktop/Executable_soffice.mk')
| -rw-r--r-- | desktop/Executable_soffice.mk | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index e82f190428c2..8368209b6089 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -25,41 +25,31 @@ $(eval $(call gb_Executable_Executable,soffice)) -$(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) - $(eval $(call gb_Executable_add_precompiled_header,soffice,desktop/inc/pch/precompiled_desktop.hxx)) $(eval $(call gb_Executable_set_include,soffice,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ - -I$(SRCDIR)/desktop/source/inc \ )) $(eval $(call gb_Executable_add_linked_libs,soffice,\ sal \ - sofficeapp \ )) -$(eval $(call gb_Executable_add_cobjects,soffice,\ - desktop/source/app/copyright_ascii_ooo \ - desktop/source/app/main \ +$(eval $(call gb_Executable_add_linked_libs,soffice,\ + advapi32 \ + shell32 \ + shlwapi \ + user32 \ )) $(eval $(call gb_Executable_add_linked_static_libs,soffice,\ ooopathutils \ )) -ifeq ($(COM),MSC) - -$(eval $(call gb_Executable_set_ldflags,soffice,\ - $$(LDFLAGS) \ - /STACK:10000000 \ -)) - -endif - $(eval $(call gb_Executable_add_noexception_objects,soffice,\ desktop/win32/source/extendloaderenvironment \ + desktop/win32/source/officeloader/officeloader \ )) # vim: set ts=4 sw=4 et: |