diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 15:47:45 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 15:47:45 +0200 |
| commit | 6f65af360c94a9649f6411d2954d8a15ecbfa837 (patch) | |
| tree | 43f96613f53a102298dab7268ac5205e83751d47 | |
| parent | 151eba7caa58c52ca4c4f2542de91c9aa41d00ab (diff) | |
Build unopkg.exe directly.
| -rw-r--r-- | desktop/Executable_unopkg.mk (renamed from desktop/Executable_guiloader.mk) | 19 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_unopkg.mk index d04ee321cd2a..f68ec85c27fc 100644 --- a/desktop/Executable_guiloader.mk +++ b/desktop/Executable_unopkg.mk @@ -23,31 +23,26 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Executable_Executable,guiloader)) +$(eval $(call gb_Executable_Executable,unopkg)) -$(eval $(call gb_Executable_set_targettype_gui,guiloader,YES)) +$(eval $(call gb_Executable_set_targettype_gui,unopkg,YES)) -$(eval $(call gb_Executable_add_precompiled_header,guiloader,desktop/inc/pch/precompiled_desktop.hxx)) +$(eval $(call gb_Executable_add_precompiled_header,unopkg,desktop/inc/pch/precompiled_desktop.hxx)) -$(eval $(call gb_Executable_set_include,guiloader,\ +$(eval $(call gb_Executable_set_include,unopkg,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ )) -$(eval $(call gb_Executable_add_linked_static_libs,guiloader,\ +$(eval $(call gb_Executable_add_linked_static_libs,unopkg,\ ooopathutils \ )) -ifeq ($(OS),WNT) - -$(eval $(call gb_Executable_add_linked_libs,guiloader,\ +$(eval $(call gb_Executable_add_linked_libs,unopkg,\ user32 \ )) -endif - - -$(eval $(call gb_Executable_add_noexception_objects,guiloader,\ +$(eval $(call gb_Executable_add_noexception_objects,unopkg,\ desktop/win32/source/extendloaderenvironment \ desktop/win32/source/guiloader/genericloader \ )) diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 5c7a5a40778b..ad0165c37142 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -66,7 +66,6 @@ $(eval $(call gb_Module_add_targets,desktop,\ ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,desktop,\ - Executable_guiloader \ Executable_guistdio \ Executable_loader2 \ Executable_quickstart \ @@ -79,6 +78,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ Executable_sweb \ Executable_swriter \ Executable_unoinfo \ + Executable_unopkg \ Executable_unopkg.com \ Package_manifest \ Package_rcfile \ |