diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-09-22 12:45:18 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-22 12:49:10 +0200 |
commit | 919ce6a9b83daebc0dc5b787ce748f6d6899d51f (patch) | |
tree | a8de686e885f7176d3ae720164abe944e6c469ad /desktop/Executable_unopkg.com.mk | |
parent | A trailing "\0" on an ICON line is unnecessary and causes an error (diff) | |
download | core-919ce6a9b83daebc0dc5b787ce748f6d6899d51f.tar.gz core-919ce6a9b83daebc0dc5b787ce748f6d6899d51f.zip |
Unify the MinGW / native Win temporary name here.
Diffstat (limited to 'desktop/Executable_unopkg.com.mk')
-rw-r--r-- | desktop/Executable_unopkg.com.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk index 54106bbf9671..ee735094ee03 100644 --- a/desktop/Executable_unopkg.com.mk +++ b/desktop/Executable_unopkg.com.mk @@ -23,33 +23,27 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) -unopkgcom := unopkg_com -else -unopkgcom := unopkg.com -endif +$(eval $(call gb_Executable_Executable,unopkg_com)) -$(eval $(call gb_Executable_Executable,$(unopkgcom))) +$(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO)) -$(eval $(call gb_Executable_set_targettype_gui,$(unopkgcom),NO)) +$(eval $(call gb_Executable_add_precompiled_header,unopkg_com,desktop/inc/pch/precompiled_desktop.hxx)) -$(eval $(call gb_Executable_add_precompiled_header,$(unopkgcom),desktop/inc/pch/precompiled_desktop.hxx)) - -$(eval $(call gb_Executable_set_include,$(unopkgcom),\ +$(eval $(call gb_Executable_set_include,unopkg_com,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ )) -$(eval $(call gb_Executable_add_defs,$(unopkgcom),\ +$(eval $(call gb_Executable_add_defs,unopkg_com,\ $(LFS_CFLAGS) \ )) -$(eval $(call gb_Executable_add_exception_objects,$(unopkgcom),\ +$(eval $(call gb_Executable_add_exception_objects,unopkg_com,\ desktop/win32/source/guistdio/unopkgio \ )) -# the resulting executable is called $(unopkgcom).exe, copy it to unopkg.com -$(eval $(call gb_Package_Package,$(unopkgcom),$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,$(unopkgcom),bin/unopkg.com,$(unopkgcom).exe)) +# the resulting executable is called unopkg_com.exe, copy it to unopkg.com +$(eval $(call gb_Package_Package,unopkg_com,$(OUTDIR)/bin)) +$(eval $(call gb_Package_add_file,unopkg_com,bin/unopkg.com,unopkg_com.exe)) # vim: set ts=4 sw=4 et: |